diff --git a/app/etc/di.xml b/app/etc/di.xml index b4c5f94880ed2..6056a54c66468 100644 --- a/app/etc/di.xml +++ b/app/etc/di.xml @@ -1854,7 +1854,7 @@ ^8\.0\. ^5\.7\. - ^10\.[2-4]\. + ^10\.[2-6]\. diff --git a/lib/internal/Magento/Framework/Test/Unit/DB/Adapter/SqlVersionProviderTest.php b/lib/internal/Magento/Framework/Test/Unit/DB/Adapter/SqlVersionProviderTest.php index 13fbf30c99de8..854f5523968d9 100644 --- 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.'