Skip to content

Commit 894dcdd

Browse files
committed
MC-14884: MySQL Upgrade - v8
1 parent 054d374 commit 894dcdd

File tree

7 files changed

+42
-183
lines changed

7 files changed

+42
-183
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,8 @@
5050
KEY `TEST_TABLE_TINYINT_BIGINT` (`tinyint`,`bigint`),
5151
KEY `TEST_TABLE_SMALLINT_MAIN_REFERENCE_TABLE_SMALLINT_REF` (`smallint_main`),
5252
KEY `FK_FB77604C299EB8612D01E4AF8D9931F2` (`integer_main`),
53-
CONSTRAINT `FK_FB77604C299EB8612D01E4AF8D9931F2` FOREIGN KEY (`integer_main`)
54-
REFERENCES `auto_increment_test` (`int_auto_increment_with_nullable`) ON DELETE CASCADE,
55-
CONSTRAINT `TEST_TABLE_SMALLINT_MAIN_REFERENCE_TABLE_SMALLINT_REF` FOREIGN KEY (`smallint_main`)
56-
REFERENCES `reference_table` (`smallint_ref`) ON DELETE CASCADE,
57-
CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`)
58-
REFERENCES `reference_table` (`tinyint_ref`) ON DELETE SET NULL
53+
CONSTRAINT `FK_FB77604C299EB8612D01E4AF8D9931F2` FOREIGN KEY (`integer_main`) REFERENCES `auto_increment_test` (`int_auto_increment_with_nullable`) ON DELETE CASCADE,
54+
CONSTRAINT `TEST_TABLE_SMALLINT_MAIN_REFERENCE_TABLE_SMALLINT_REF` FOREIGN KEY (`smallint_main`) REFERENCES `reference_table` (`smallint_ref`) ON DELETE CASCADE,
55+
CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`) REFERENCES `reference_table` (`tinyint_ref`) ON DELETE SET NULL
5956
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
6057
];

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

Lines changed: 0 additions & 56 deletions
This file was deleted.

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

Lines changed: 0 additions & 56 deletions
This file was deleted.

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

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,51 +5,51 @@
55
*/
66
// @codingStandardsIgnoreFile
77
return ['CREATE TABLE `reference_table` (
8-
`tinyint_ref` tinyint(4) NOT NULL AUTO_INCREMENT ,
9-
`tinyint_without_padding` tinyint(4) NOT NULL DEFAULT 0 ,
10-
`bigint_without_padding` bigint(20) NOT NULL DEFAULT 0 ,
11-
`smallint_without_padding` smallint(6) NOT NULL DEFAULT 0 ,
12-
`integer_without_padding` int(11) NOT NULL DEFAULT 0 ,
13-
`smallint_with_big_padding` smallint(6) NOT NULL DEFAULT 0 ,
14-
`smallint_without_default` smallint(6) NULL ,
15-
`int_without_unsigned` int(11) NULL ,
16-
`int_unsigned` int(10) UNSIGNED NULL ,
17-
`bigint_default_nullable` bigint(20) UNSIGNED NULL DEFAULT 1 ,
18-
`bigint_not_default_not_nullable` bigint(20) UNSIGNED NOT NULL ,
8+
`tinyint_ref` tinyint NOT NULL AUTO_INCREMENT ,
9+
`tinyint_without_padding` tinyint NOT NULL DEFAULT 0 ,
10+
`bigint_without_padding` bigint NOT NULL DEFAULT 0 ,
11+
`smallint_without_padding` smallint NOT NULL DEFAULT 0 ,
12+
`integer_without_padding` int NOT NULL DEFAULT 0 ,
13+
`smallint_with_big_padding` smallint NOT NULL DEFAULT 0 ,
14+
`smallint_without_default` smallint NULL ,
15+
`int_without_unsigned` int NULL ,
16+
`int_unsigned` int UNSIGNED NULL ,
17+
`bigint_default_nullable` bigint UNSIGNED NULL DEFAULT 1 ,
18+
`bigint_not_default_not_nullable` bigint UNSIGNED NOT NULL ,
1919
CONSTRAINT PRIMARY KEY (`tinyint_ref`)
20-
) ENGINE=innodb DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_general_ci
20+
) ENGINE=innodb DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_general_ci
2121
2222
CREATE TABLE `auto_increment_test` (
23-
`int_auto_increment_with_nullable` int(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
24-
`int_disabled_auto_increment` smallint(5) unsigned NULL DEFAULT 0 ,
23+
`int_auto_increment_with_nullable` int UNSIGNED NOT NULL AUTO_INCREMENT ,
24+
`int_disabled_auto_increment` smallint UNSIGNED NULL DEFAULT 0 ,
2525
CONSTRAINT `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` UNIQUE KEY (`int_auto_increment_with_nullable`)
26-
) ENGINE=innodb DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_general_ci
26+
) ENGINE=innodb DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_general_ci
2727
2828
CREATE TABLE `test_table` (
29-
`smallint` smallint(6) NOT NULL AUTO_INCREMENT ,
30-
`tinyint` tinyint(4) NULL ,
31-
`bigint` bigint(20) NULL DEFAULT 0 ,
32-
`float` float(12, 4) NULL DEFAULT 0 ,
33-
`double` decimal(14, 6) NULL DEFAULT 11111111.111111 ,
34-
`decimal` decimal(15, 4) NULL DEFAULT 0 ,
35-
`date` date NULL ,
36-
`timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ,
37-
`datetime` datetime NULL DEFAULT 0 ,
38-
`longtext` longtext NULL ,
39-
`mediumtext` mediumtext NULL ,
40-
`varchar` varchar(254) NULL ,
41-
`char` char(255) NULL ,
42-
`mediumblob` mediumblob NULL ,
43-
`blob` blob NULL ,
44-
`boolean` BOOLEAN NULL ,
45-
CONSTRAINT `TEST_TABLE_SMALLINT_BIGINT` UNIQUE KEY (`smallint`,`bigint`),
46-
CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`) REFERENCES `reference_table` (`tinyint_ref`) ON DELETE NO ACTION,
29+
`smallint` smallint NOT NULL AUTO_INCREMENT ,
30+
`tinyint` tinyint NULL ,
31+
`bigint` bigint NULL DEFAULT 0 ,
32+
`float` float(12, 4) NULL DEFAULT 0 ,
33+
`double` decimal(14, 6) NULL DEFAULT 11111111.111111 ,
34+
`decimal` decimal(15, 4) NULL DEFAULT 0 ,
35+
`date` date NULL ,
36+
`timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ,
37+
`datetime` datetime NULL DEFAULT 0 ,
38+
`longtext` longtext NULL ,
39+
`mediumtext` mediumtext NULL ,
40+
`varchar` varchar(254) NULL ,
41+
`char` char(255) NULL ,
42+
`mediumblob` mediumblob NULL ,
43+
`blob` blob NULL ,
44+
`boolean` BOOLEAN NULL ,
45+
CONSTRAINT `TEST_TABLE_SMALLINT_BIGINT` UNIQUE KEY (`smallint`,`bigint`),
46+
CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`) REFERENCES `reference_table` (`tinyint_ref`) ON DELETE NO ACTION,
4747
INDEX `TEST_TABLE_TINYINT_BIGINT` (`tinyint`,`bigint`)
48-
) ENGINE=innodb DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_general_ci
48+
) ENGINE=innodb DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_general_ci
4949
5050
CREATE TABLE `patch_list` (
51-
`patch_id` int(11) NOT NULL AUTO_INCREMENT COMMENT "Patch Auto Increment",
52-
`patch_name` varchar(1024) NOT NULL COMMENT "Patch Class Name",
51+
`patch_id` int NOT NULL AUTO_INCREMENT COMMENT "Patch Auto Increment",
52+
`patch_name` varchar(1024) NOT NULL COMMENT "Patch Class Name",
5353
CONSTRAINT PRIMARY KEY (`patch_id`)
5454
) ENGINE=innodb DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_general_ci COMMENT="List of data/schema patches"
5555

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log_on_upgrade.mariadb10.php

Lines changed: 0 additions & 13 deletions
This file was deleted.

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

Lines changed: 0 additions & 13 deletions
This file was deleted.

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log_on_upgrade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* See COPYING.txt for license details.
55
*/
66
// @codingStandardsIgnoreFile
7-
return ['ALTER TABLE `reference_table` MODIFY COLUMN `tinyint_without_padding` tinyint(4) NOT NULL , MODIFY COLUMN `bigint_default_nullable` bigint(20) UNSIGNED NULL DEFAULT 123 , MODIFY COLUMN `bigint_not_default_not_nullable` bigint(20) NOT NULL
7+
return ['ALTER TABLE `reference_table` MODIFY COLUMN `tinyint_without_padding` tinyint NOT NULL , MODIFY COLUMN `bigint_default_nullable` bigint UNSIGNED NULL DEFAULT 123 , MODIFY COLUMN `bigint_not_default_not_nullable` bigint NOT NULL
88
9-
ALTER TABLE `auto_increment_test` MODIFY COLUMN `int_auto_increment_with_nullable` int(10) UNSIGNED NULL
9+
ALTER TABLE `auto_increment_test` MODIFY COLUMN `int_auto_increment_with_nullable` int UNSIGNED NULL
1010
11-
ALTER TABLE `test_table` MODIFY COLUMN `float` float(12, 10) NULL DEFAULT 0 , MODIFY COLUMN `double` double(245, 10) NULL , MODIFY COLUMN `timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP , MODIFY COLUMN `varchar` varchar(100) NULL , MODIFY COLUMN `boolean` BOOLEAN NULL DEFAULT 1
11+
ALTER TABLE `test_table` MODIFY COLUMN `float` float(12, 10) NULL DEFAULT 0 , MODIFY COLUMN `double` double(245, 10) NULL , MODIFY COLUMN `timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP , MODIFY COLUMN `varchar` varchar(100) NULL , MODIFY COLUMN `boolean` BOOLEAN NULL DEFAULT 1
1212
1313
'];

0 commit comments

Comments
 (0)