Skip to content

Commit 9db5570

Browse files
glo17680glo17680
committed
AC-11995:Add compatibility with MySQL 8.4 LTS for Magento CE
1 parent 83345a7 commit 9db5570

File tree

7 files changed

+31
-39
lines changed

7 files changed

+31
-39
lines changed

‎dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/etc/db_schema.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
<constraint xsi:type="primary" referenceId="tinyint_primary">
2525
<column name="tinyint_ref"/>
2626
</constraint>
27-
<constraint xsi:type="unique" referenceId="REFERENCE_TABLE_TINYINT_REF">
28-
<column name="tinyint_ref"/>
29-
</constraint>
3027
</table>
3128
<table name="auto_increment_test" resource="default">
3229
<column xsi:type="int" name="int_auto_increment_with_nullable" identity="true" padding="12" unsigned="true"

‎dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/constraint_modification.mysql829.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
`bigint_not_default_not_nullable` bigint unsigned NOT NULL,
2727
`smallint_ref` smallint NOT NULL DEFAULT \'0\',
2828
PRIMARY KEY (`tinyint_ref`,`smallint_ref`),
29-
UNIQUE KEY `REFERENCE_TABLE_TINYINT_REF` (`tinyint_ref`),
3029
UNIQUE KEY `REFERENCE_TABLE_SMALLINT_REF` (`smallint_ref`)
3130
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
3231
'test_table' => 'CREATE TABLE `test_table` (

‎dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log.mysql829.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
`int_unsigned` int UNSIGNED NULL ,
1919
`bigint_default_nullable` bigint UNSIGNED NULL DEFAULT 1 ,
2020
`bigint_not_default_not_nullable` bigint UNSIGNED NOT NULL ,
21-
CONSTRAINT PRIMARY KEY (`tinyint_ref`),
22-
CONSTRAINT `REFERENCE_TABLE_TINYINT_REF` UNIQUE KEY (`tinyint_ref`)
21+
CONSTRAINT PRIMARY KEY (`tinyint_ref`)
2322
) ENGINE=innodb DEFAULT CHARSET=utf8mb3 DEFAULT COLLATE=utf8mb3_general_ci
2423
2524
CREATE TABLE `auto_increment_test` (

‎dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule8/revisions/setup_install_with_converting/InstallSchema.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,16 +166,13 @@ private function addIndexesToMainTable($table)
166166
['type' => AdapterInterface::INDEX_TYPE_UNIQUE]
167167
)->addIndex(
168168
'MODULE8_INSTALL_INDEX_3',
169-
['module8_is_guest'],
170-
['type' => AdapterInterface::INDEX_TYPE_UNIQUE]
169+
['module8_is_guest']
171170
)->addIndex(
172171
'MODULE8_INSTALL_INDEX_4',
173-
['module8_contact_id'],
174-
['type' => AdapterInterface::INDEX_TYPE_UNIQUE]
172+
['module8_contact_id']
175173
)->addIndex(
176174
'MODULE8_INSTALL_INDEX_TEMP',
177-
['module8_content'],
178-
['type' => AdapterInterface::INDEX_TYPE_UNIQUE]
175+
['module8_content']
179176
)->addIndex(
180177
'MODULE8_INSTALL_UNIQUE_INDEX_TEMP',
181178
['module8_contact_group_id'],

‎dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupInstall/TestSetupDeclarationModule8/db_schema.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@
1919
<column name="module8_email_contact_id"/>
2020
<column name="module8_is_guest"/>
2121
</constraint>
22-
<constraint xsi:type="unique" referenceId="MODULE8_INSTALL_INDEX_3">
23-
<column name="module8_is_guest"/>
24-
</constraint>
25-
<constraint xsi:type="unique" referenceId="MODULE8_INSTALL_INDEX_4">
26-
<column name="module8_contact_id"/>
27-
</constraint>
28-
<constraint xsi:type="unique" referenceId="MODULE8_INSTALL_INDEX_TEMP" disabled="true">
29-
<column name="module8_content"/>
30-
</constraint>
3122
<constraint xsi:type="unique" referenceId="MODULE8_INSTALL_UNIQUE_INDEX_TEMP" disabled="true">
3223
<column name="module8_contact_group_id"/>
3324
</constraint>
3425
<index referenceId="MODULE8_INSTALL_INDEX_1" indexType="btree">
3526
<column name="module8_email_contact_id"/>
3627
</index>
28+
<index referenceId="MODULE8_INSTALL_INDEX_3" indexType="btree">
29+
<column name="module8_is_guest"/>
30+
</index>
31+
<index referenceId="MODULE8_INSTALL_INDEX_4" indexType="btree">
32+
<column name="module8_contact_id"/>
33+
</index>
34+
<index referenceId="MODULE8_INSTALL_INDEX_TEMP" indexType="btree" disabled="true">
35+
<column name="module8_content"/>
36+
</index>
3737
</table>
3838
<table name="module8_test_second_table" resource="default" engine="innodb" comment="Second Test Table for Module8">
3939
<column xsi:type="int" name="module8_entity_id" padding="10" unsigned="true" nullable="false" identity="true"

‎dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupUpgrade/TestSetupDeclarationModule8/db_schema_install.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717
<column name="module8_email_contact_id"/>
1818
<column name="module8_is_guest"/>
1919
</constraint>
20-
<constraint xsi:type="unique" referenceId="MODULE8_INSTALL_INDEX_3">
21-
<column name="module8_is_guest"/>
22-
</constraint>
23-
<constraint xsi:type="unique" referenceId="MODULE8_INSTALL_INDEX_4">
24-
<column name="module8_contact_id"/>
25-
</constraint>
26-
<constraint xsi:type="unique" referenceId="MODULE8_INSTALL_INDEX_TEMP">
27-
<column name="module8_content"/>
28-
</constraint>
2920
<constraint xsi:type="unique" referenceId="MODULE8_INSTALL_UNIQUE_INDEX_TEMP">
3021
<column name="module8_contact_group_id"/>
3122
</constraint>
3223
<index referenceId="MODULE8_INSTALL_INDEX_1" indexType="btree">
3324
<column name="module8_email_contact_id"/>
3425
</index>
26+
<index referenceId="MODULE8_INSTALL_INDEX_3" indexType="btree">
27+
<column name="module8_is_guest"/>
28+
</index>
29+
<index referenceId="MODULE8_INSTALL_INDEX_4" indexType="btree">
30+
<column name="module8_contact_id"/>
31+
</index>
32+
<index referenceId="MODULE8_INSTALL_INDEX_TEMP" indexType="btree">
33+
<column name="module8_content"/>
34+
</index>
3535
</table>
3636
<table name="module8_test_second_table" resource="default" engine="innodb" comment="Second Test Table for Module8">
3737
<column xsi:type="int" name="module8_entity_id" padding="10" unsigned="true" nullable="false" identity="true"

‎dev/tests/setup-integration/testsuite/Magento/Developer/_files/SetupUpgrade/TestSetupDeclarationModule8/db_schema_upgrade.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717
<column name="module8_email_contact_id"/>
1818
<column name="module8_is_guest"/>
1919
</constraint>
20-
<constraint xsi:type="unique" referenceId="MODULE8_INSTALL_INDEX_3">
21-
<column name="module8_is_guest"/>
22-
</constraint>
23-
<constraint xsi:type="unique" referenceId="MODULE8_INSTALL_INDEX_4">
24-
<column name="module8_contact_id"/>
25-
</constraint>
26-
<constraint xsi:type="unique" referenceId="MODULE8_INSTALL_INDEX_TEMP" disabled="true">
27-
<column name="module8_content"/>
28-
</constraint>
2920
<constraint xsi:type="unique" referenceId="MODULE8_INSTALL_UNIQUE_INDEX_TEMP" disabled="true">
3021
<column name="module8_contact_group_id"/>
3122
</constraint>
3223
<index referenceId="MODULE8_INSTALL_INDEX_1" indexType="btree">
3324
<column name="module8_email_contact_id"/>
3425
</index>
26+
<index referenceId="MODULE8_INSTALL_INDEX_3" indexType="btree">
27+
<column name="module8_is_guest"/>
28+
</index>
29+
<index referenceId="MODULE8_INSTALL_INDEX_4" indexType="btree">
30+
<column name="module8_contact_id"/>
31+
</index>
32+
<index referenceId="MODULE8_INSTALL_INDEX_TEMP" indexType="btree" disabled="true">
33+
<column name="module8_content"/>
34+
</index>
3535
<column xsi:type="int" name="module8_update_column" padding="11" unsigned="false" nullable="false"
3636
identity="false" comment="Module_8 Update Column"/>
3737
</table>

0 commit comments

Comments
 (0)