Skip to content

Commit 40ceb70

Browse files
authored
Merge pull request #7233 from magento-lynx/ac-488
[Lynx] Updated setup integration tests for MySQL 8.0.27
2 parents 0af0fba + 37b7141 commit 40ceb70

File tree

6 files changed

+27
-12
lines changed

6 files changed

+27
-12
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
`int_auto_increment_with_nullable` int unsigned NOT NULL AUTO_INCREMENT,
1010
`int_disabled_auto_increment` smallint unsigned DEFAULT \'0\',
1111
UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
12-
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
12+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
1313
'reference_table' => 'CREATE TABLE `reference_table` (
1414
`tinyint_ref` tinyint NOT NULL AUTO_INCREMENT,
1515
`tinyint_without_padding` tinyint NOT NULL DEFAULT \'0\',
@@ -25,7 +25,7 @@
2525
`smallint_ref` smallint NOT NULL DEFAULT \'0\',
2626
PRIMARY KEY (`tinyint_ref`,`smallint_ref`),
2727
UNIQUE KEY `REFERENCE_TABLE_SMALLINT_REF` (`smallint_ref`)
28-
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
28+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
2929
'test_table' => 'CREATE TABLE `test_table` (
3030
`smallint` smallint DEFAULT NULL,
3131
`tinyint` tinyint DEFAULT NULL,
@@ -53,5 +53,5 @@
5353
CONSTRAINT `FK_FB77604C299EB8612D01E4AF8D9931F2` FOREIGN KEY (`integer_main`) REFERENCES `auto_increment_test` (`int_auto_increment_with_nullable`) ON DELETE CASCADE,
5454
CONSTRAINT `TEST_TABLE_SMALLINT_MAIN_REFERENCE_TABLE_SMALLINT_REF` FOREIGN KEY (`smallint_main`) REFERENCES `reference_table` (`smallint_ref`) ON DELETE CASCADE,
5555
CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`) REFERENCES `reference_table` (`tinyint_ref`) ON DELETE SET NULL
56-
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
56+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
5757
];

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/rollback.mysql8.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
`store_owner_id` smallint DEFAULT NULL COMMENT \'Store Owner Reference\',
1313
KEY `STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID` (`store_owner_id`),
1414
CONSTRAINT `STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID` FOREIGN KEY (`store_owner_id`) REFERENCES `store_owner` (`owner_id`) ON DELETE SET NULL
15-
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
15+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
1616
'store_owner' => 'CREATE TABLE `store_owner` (
1717
`owner_id` smallint NOT NULL AUTO_INCREMENT,
1818
`store_owner_name` varchar(255) DEFAULT NULL COMMENT \'Store Owner Name\',
1919
PRIMARY KEY (`owner_id`)
20-
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT=\'Store owner information\''
20+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT=\'Store owner information\''
2121
],
2222
'after' => [
2323
'store' => 'CREATE TABLE `store` (
2424
`store_owner` varchar(255) DEFAULT NULL COMMENT \'Store Owner Name\'
25-
) ENGINE=InnoDB DEFAULT CHARSET=utf8'
25+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3'
2626
]
2727
];

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_removal.mysql8.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
`int_auto_increment_with_nullable` int unsigned NOT NULL AUTO_INCREMENT,
99
`int_disabled_auto_increment` smallint unsigned DEFAULT \'0\',
1010
UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
11-
) ENGINE=InnoDB DEFAULT CHARSET=utf8'
11+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3'
1212
];
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
return [
9+
'before' => 'CREATE TABLE `some_table` (
10+
`some_column` varchar(255) DEFAULT NULL COMMENT \'Some Column Name\'
11+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
12+
'after' => 'CREATE TABLE `some_table_renamed` (
13+
`some_column` varchar(255) DEFAULT NULL COMMENT \'Some Column Name\'
14+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
15+
];

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule2/fixture/shards.mysql8.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
`smallint` smallint NOT NULL AUTO_INCREMENT,
99
`varchar` varchar(254) DEFAULT NULL,
1010
PRIMARY KEY (`smallint`)
11-
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
11+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
1212
'test_table_two' => 'CREATE TABLE `test_table_two` (
1313
`smallint` smallint NOT NULL AUTO_INCREMENT,
1414
`varchar` varchar(254) DEFAULT NULL,
1515
PRIMARY KEY (`smallint`)
16-
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
16+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
1717
'reference_table' => 'CREATE TABLE `reference_table` (
1818
`tinyint_ref` tinyint NOT NULL AUTO_INCREMENT,
1919
`tinyint_without_padding` tinyint NOT NULL DEFAULT \'0\',
@@ -27,10 +27,10 @@
2727
`bigint_default_nullable` bigint unsigned DEFAULT \'1\',
2828
`bigint_not_default_not_nullable` bigint unsigned NOT NULL,
2929
PRIMARY KEY (`tinyint_ref`)
30-
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
30+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
3131
'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
3232
`int_auto_increment_with_nullable` int unsigned NOT NULL AUTO_INCREMENT,
3333
`int_disabled_auto_increment` smallint unsigned DEFAULT \'0\',
3434
UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
35-
) ENGINE=InnoDB DEFAULT CHARSET=utf8'
35+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3'
3636
];

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule9/fixture/declarative_installer/disabling_tables.mysql8.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
`int_auto_increment_with_nullable` int unsigned NOT NULL AUTO_INCREMENT,
1111
`int_disabled_auto_increment` smallint unsigned DEFAULT \'0\',
1212
UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
13-
) ENGINE=InnoDB DEFAULT CHARSET=utf8'
13+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3'
1414
];

0 commit comments

Comments
 (0)