Skip to content

Commit 81191c6

Browse files
committed
AC-6921:MariaDB 10.6 support for 2.4.6
1 parent eac615e commit 81191c6

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

app/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1854,7 +1854,7 @@
18541854
<argument name="supportedVersionPatterns" xsi:type="array">
18551855
<item name="MySQL-8" xsi:type="string">^8\.0\.</item>
18561856
<item name="MySQL-5.7" xsi:type="string">^5\.7\.</item>
1857-
<item name="MariaDB-(10.2-10.4)" xsi:type="string">^10\.[2-4]\.</item>
1857+
<item name="MariaDB-(10.2-10.6)" xsi:type="string">^10\.[2-6]\.</item>
18581858
</argument>
18591859
</arguments>
18601860
</type>

lib/internal/Magento/Framework/Test/Unit/DB/Adapter/SqlVersionProviderTest.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class SqlVersionProviderTest extends TestCase
5050
private $supportedVersionPatterns = [
5151
'MySQL-8' => '^8\.0\.',
5252
'MySQL-5.7' => '^5\.7\.',
53-
'MariaDB-(10.2-10.4)' => '^10\.[2-4]\.'
53+
'MariaDB-(10.2-10.6)' => '^10\.[2-6]\.'
5454
];
5555

5656
/**
@@ -94,7 +94,7 @@ public function testGetSqlVersionProviderReturnsRightResponse(
9494
*/
9595
public function testSqlVersionProviderThrowsExceptionWhenNonSupportedEngineUsed(): void
9696
{
97-
$this->prepareSqlProviderAndMySQLAdapter(['version' => '10.5.0-MariaDB-1:10.5.0+maria~bionic']);
97+
$this->prepareSqlProviderAndMySQLAdapter(['version' => '10.7.0-MariaDB-1:10.7.0+maria~bionic']);
9898
$this->expectExceptionMessage('Current version of RDBMS is not supported.');
9999
$this->expectException(ConnectionException::class);
100100
$this->sqlVersionProvider->getSqlVersion();
@@ -106,6 +106,10 @@ public function testSqlVersionProviderThrowsExceptionWhenNonSupportedEngineUsed(
106106
public function executeDataProvider(): array
107107
{
108108
return [
109+
'MariaDB-10.6' => [
110+
['version' => '10.6.10-MariaDB'],
111+
'10.6.'
112+
],
109113
'MariaDB-10.4' => [
110114
['version' => '10.4.12-MariaDB-1:10.4.12+maria~bionic'],
111115
'10.4.'

0 commit comments

Comments
 (0)