Increase the system requirements for MariaDB to 10.5.15

The versions 10.5.12 and 10.5.13 (10.5.14 was never released) contain a bug that breaks window functions when the SQL mode `ONLY_FULL_GROUP_BY` is set.

diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.0_checkSystemRequirements.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.0_checkSystemRequirements.php
index ebc19001a6c50dd3bd315c657f78305d289fc624..456b31019b5c93819600d06ab5d393813440b9e8 100644 (file)
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.0_checkSystemRequirements.php
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.0_checkSystemRequirements.php
@@ -45,7 +45,7 @@ if (!\extension_loaded('intl')) {
 $sqlVersion = WCF::getDB()->getVersion();
 $compareSQLVersion = \preg_replace('/^(\d+\.\d+\.\d+).*$/', '\\1', $sqlVersion);
 if (\stripos($sqlVersion, 'MariaDB') !== false) {
-    $neededSqlVersion = '10.5.12';
+    $neededSqlVersion = '10.5.15';
     $sqlFork = 'MariaDB';
 } else {
     $sqlFork = 'MySQL';

diff --git a/wcfsetup/install/files/lib/acp/form/PackageEnableUpgradeOverrideForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageEnableUpgradeOverrideForm.class.php
index db63ab158e049d6455068d76d1d95b6bf9205e35..cc9083fac9a8bf1c0b6391465f59ad6e6df90d5d 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/PackageEnableUpgradeOverrideForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PackageEnableUpgradeOverrideForm.class.php
@@ -226,13 +226,13 @@ final class PackageEnableUpgradeOverrideForm extends AbstractFormBuilderForm
 
         if (\stripos($sqlVersion, 'MariaDB') !== false) {
             $databaseName = "MariaDB {$compareSQLVersion}";
-            $expectedVersion = '10.5.12';
+            $expectedVersion = '10.5.15';
             $alternativeDatabase = 'MySQL 8.0.30+';
         } else {
             $databaseName = "MySQL {$compareSQLVersion}";
             $expectedVersion = $databaseName = "MariaDB {$compareSQLVersion}";
             $expectedVersion = '8.0.30';
-            $alternativeDatabase = 'MariaDB 10.5.12+';
+            $alternativeDatabase = 'MariaDB 10.5.15+';
         }
 
         $result = (\version_compare(

diff --git a/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php b/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php
index 6a21ce9cbb04201d4a956c310d2341b21270f71f..19278c61bd7087bf8cba2b5a05326b4998d4b8c2 100644 (file)
--- a/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/SystemCheckPage.class.php
@@ -57,7 +57,7 @@ class SystemCheckPage extends AbstractPage
             '8' => '8.0.30',
         ],
         'mariadb' => [
-            '10' => '10.5.12',
+            '10' => '10.5.15',
         ],
     ];
 

diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php
index b020b0ac321d88aa3feaf0583b92471232e5381b..0a23948dff68257e4f6de34415b3bc94c820193d 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@ -537,8 +537,8 @@ final class WCFSetup extends WCF
                 $sqlVersion = $db->getVersion();
                 $compareSQLVersion = \preg_replace('/^(\d+\.\d+\.\d+).*$/', '\\1', $sqlVersion);
                 if (\stripos($sqlVersion, 'MariaDB')) {
-                    if (!(\version_compare($compareSQLVersion, '10.5.12') >= 0)) {
-                        throw new SystemException("Insufficient MariaDB version '" . $compareSQLVersion . "'. Version '10.5.12' or greater is needed.");
+                    if (!(\version_compare($compareSQLVersion, '10.5.15') >= 0)) {
+                        throw new SystemException("Insufficient MariaDB version '" . $compareSQLVersion . "'. Version '10.5.15' or greater is needed.");
                     }
                 } else {
                     if (!(\version_compare($compareSQLVersion, '8.0.30') >= 0)) {

diff --git a/wcfsetup/test.php b/wcfsetup/test.php
index 9b9b01cf6fc6e8a7c8a5cfa8ca61d891ccfdcac2..a9277de7d8fdfa92773b3be4e3c9c73026c0296e 100644 (file)
--- a/wcfsetup/test.php
+++ b/wcfsetup/test.php
@@ -79,8 +79,8 @@ $phrases = [
         'en' => 'MySQL Requirements',
     ],
     'mysql_version' => [
-        'de' => 'Bitte stellen Sie sicher, dass MySQL 8.0.30+  oder MariaDB 10.5.12+ mit InnoDB-Unterstützung vorhanden ist.',
-        'en' => 'Please make sure that MySQL 8.0.30+ or MariaDB 10.5.12+, with InnoDB support is available.',
+        'de' => 'Bitte stellen Sie sicher, dass MySQL 8.0.30+  oder MariaDB 10.5.15+ mit InnoDB-Unterstützung vorhanden ist.',
+        'en' => 'Please make sure that MySQL 8.0.30+ or MariaDB 10.5.15+, with InnoDB support is available.',
     ],
     'result' => [
         'de' => 'Ergebnis',