Skip to content

Commit 20fc4cf

Browse files
committed
MC-14884: MySQL Upgrade - v8
Rename SqlVrsionProvider constants and change some comments in doc blocks
1 parent 3d5bf67 commit 20fc4cf

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/DataProviderFromFile.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class DataProviderFromFile
2525
* @var array
2626
*/
2727
const POSSIBLE_SUFFIXES = [
28-
SqlVersionProvider::MYSQL_8_VERSION => 'mysql8',
28+
SqlVersionProvider::MYSQL_8_0_VERSION => 'mysql8',
2929
SqlVersionProvider::MARIA_DB_10_VERSION => 'mariadb10',
3030
];
3131

lib/internal/Magento/Framework/DB/Adapter/SqlVersionProvider.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,27 @@
1212
/**
1313
* Class GetDbVersion provides sql engine version requesting version variable
1414
*
15-
* @deprecated Temporary solution which will be replaced after release of main functionality
15+
* @deprecated First iteration of proper solution which is planning to implement soon
1616
*/
1717
class SqlVersionProvider
1818
{
1919
/**
20-
* @deprecated Temporary solution which will be replaced after release of main functionality
20+
* @deprecated First iteration of proper solution which is planning to implement soon
2121
*/
22-
public const MYSQL_8_VERSION = '8.0.';
22+
public const MYSQL_8_0_VERSION = '8.0.';
2323

2424
/**
25-
* @deprecated Temporary solution which will be replaced after release of main functionality
25+
* @deprecated First iteration of proper solution which is planning to implement soon
2626
*/
27-
public const MYSQL_57_VERSION = '5.7.';
27+
public const MYSQL_5_7_VERSION = '5.7.';
2828

2929
/**
30-
* @deprecated Temporary solution which will be replaced after release of main functionality
30+
* @deprecated First iteration of proper solution which is planning to implement soon
3131
*/
3232
public const MARIA_DB_10_VERSION = '10.';
3333

3434
/**
35-
* @deprecated Temporary solution which will be replaced after release of main functionality
35+
* @deprecated First iteration of proper solution which is planning to implement soon
3636
*/
3737
private const VERSION_VAR_NAME = 'version';
3838

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@ public function executeDataProvider(): array
116116
],
117117
'MySQL-5.7' => [
118118
['version' => '5.7.29'],
119-
SqlVersionProvider::MYSQL_57_VERSION,
119+
SqlVersionProvider::MYSQL_5_7_VERSION,
120120
],
121121
'MySQL-8' => [
122122
['version' => '8.0.19'],
123-
SqlVersionProvider::MYSQL_8_VERSION,
123+
SqlVersionProvider::MYSQL_8_0_VERSION,
124124
],
125125
'Percona' => [
126126
['version' => '5.7.29-32'],
127-
SqlVersionProvider::MYSQL_57_VERSION,
127+
SqlVersionProvider::MYSQL_5_7_VERSION,
128128
],
129129
];
130130
}

0 commit comments

Comments
 (0)