Skip to content

Commit 3fae211

Browse files
committed
AC-11995:Add compatibility with MySQL 8.4 LTS for Magento CE
1 parent 1331970 commit 3fae211

File tree

4 files changed

+33
-30
lines changed

4 files changed

+33
-30
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,16 @@ private function addIndexesToMainTable($table)
166166
['type' => AdapterInterface::INDEX_TYPE_UNIQUE]
167167
)->addIndex(
168168
'MODULE8_INSTALL_INDEX_3',
169-
['module8_is_guest']
169+
['module8_is_guest'],
170+
['type' => AdapterInterface::INDEX_TYPE_UNIQUE]
170171
)->addIndex(
171172
'MODULE8_INSTALL_INDEX_4',
172-
['module8_contact_id']
173+
['module8_contact_id'],
174+
['type' => AdapterInterface::INDEX_TYPE_UNIQUE]
173175
)->addIndex(
174176
'MODULE8_INSTALL_INDEX_TEMP',
175-
['module8_content']
177+
['module8_content'],
178+
['type' => AdapterInterface::INDEX_TYPE_UNIQUE]
176179
)->addIndex(
177180
'MODULE8_INSTALL_UNIQUE_INDEX_TEMP',
178181
['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>
2231
<constraint xsi:type="unique" referenceId="MODULE8_INSTALL_UNIQUE_INDEX_TEMP" disabled="true">
2332
<column name="module8_contact_group_id"/>
2433
</constraint>
2534
<index referenceId="MODULE8_INSTALL_INDEX_1" indexType="btree">
2635
<column name="module8_email_contact_id"/>
2736
</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>
2029
<constraint xsi:type="unique" referenceId="MODULE8_INSTALL_UNIQUE_INDEX_TEMP">
2130
<column name="module8_contact_group_id"/>
2231
</constraint>
2332
<index referenceId="MODULE8_INSTALL_INDEX_1" indexType="btree">
2433
<column name="module8_email_contact_id"/>
2534
</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>
2029
<constraint xsi:type="unique" referenceId="MODULE8_INSTALL_UNIQUE_INDEX_TEMP" disabled="true">
2130
<column name="module8_contact_group_id"/>
2231
</constraint>
2332
<index referenceId="MODULE8_INSTALL_INDEX_1" indexType="btree">
2433
<column name="module8_email_contact_id"/>
2534
</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)