AC-6921:MariaDB 10.6 support for 2.4.6

magento · Dec 14, 2022 · 81191c6 · 81191c6
1 parent eac615e
commit 81191c6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/etc/di.xml b/app/etc/di.xml
@@ -1854,7 +1854,7 @@
             <argument name="supportedVersionPatterns" xsi:type="array">
                 <item name="MySQL-8" xsi:type="string">^8\.0\.</item>
                 <item name="MySQL-5.7" xsi:type="string">^5\.7\.</item>
-                <item name="MariaDB-(10.2-10.4)" xsi:type="string">^10\.[2-4]\.</item>
+                <item name="MariaDB-(10.2-10.6)" xsi:type="string">^10\.[2-6]\.</item>
             </argument>
         </arguments>
     </type>

diff --git a/lib/internal/Magento/Framework/Test/Unit/DB/Adapter/SqlVersionProviderTest.php b/lib/internal/Magento/Framework/Test/Unit/DB/Adapter/SqlVersionProviderTest.php
@@ -50,7 +50,7 @@ class SqlVersionProviderTest extends TestCase
     private $supportedVersionPatterns = [
         'MySQL-8' => '^8\.0\.',
         'MySQL-5.7' => '^5\.7\.',
-        'MariaDB-(10.2-10.4)' => '^10\.[2-4]\.'
+        'MariaDB-(10.2-10.6)' => '^10\.[2-6]\.'
     ];
 
     /**
@@ -94,7 +94,7 @@ public function testGetSqlVersionProviderReturnsRightResponse(
      */
     public function testSqlVersionProviderThrowsExceptionWhenNonSupportedEngineUsed(): void
     {
-        $this->prepareSqlProviderAndMySQLAdapter(['version' => '10.5.0-MariaDB-1:10.5.0+maria~bionic']);
+        $this->prepareSqlProviderAndMySQLAdapter(['version' => '10.7.0-MariaDB-1:10.7.0+maria~bionic']);
         $this->expectExceptionMessage('Current version of RDBMS is not supported.');
         $this->expectException(ConnectionException::class);
         $this->sqlVersionProvider->getSqlVersion();
@@ -106,6 +106,10 @@ public function testSqlVersionProviderThrowsExceptionWhenNonSupportedEngineUsed(
     public function executeDataProvider(): array
     {
         return [
+            'MariaDB-10.6' => [
+                ['version' => '10.6.10-MariaDB'],
+                '10.6.'
+            ],
             'MariaDB-10.4' => [
                 ['version' => '10.4.12-MariaDB-1:10.4.12+maria~bionic'],
                 '10.4.'