Skip to content

Commit 054d374

Browse files
fascinosumfascinosum
committed
MC-14884: MySQL Upgrade - v8
1 parent 9f7cf85 commit 054d374

File tree

16 files changed

+153
-123
lines changed

16 files changed

+153
-123
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
*/
66
return [
77
'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
8-
`int_auto_increment_with_nullable` int(15) unsigned DEFAULT NULL,
9-
`int_disabled_auto_increment` smallint(12) unsigned DEFAULT \'0\',
8+
`int_auto_increment_with_nullable` int(10) unsigned DEFAULT NULL,
9+
`int_disabled_auto_increment` smallint(5) unsigned DEFAULT \'0\',
1010
UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
1111
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
1212
'reference_table' => 'CREATE TABLE `reference_table` (
1313
`tinyint_ref` tinyint(7) NOT NULL AUTO_INCREMENT,
14-
`tinyint_without_padding` tinyint(2) NOT NULL,
14+
`tinyint_without_padding` tinyint(4) NOT NULL,
1515
`bigint_without_padding` bigint(20) NOT NULL DEFAULT \'0\',
1616
`smallint_without_padding` smallint(5) NOT NULL DEFAULT \'0\',
1717
`integer_without_padding` int(11) NOT NULL DEFAULT \'0\',
@@ -42,7 +42,7 @@
4242
`boolean` tinyint(1) DEFAULT \'1\',
4343
UNIQUE KEY `TEST_TABLE_SMALLINT_BIGINT` (`smallint`,`bigint`),
4444
KEY `TEST_TABLE_TINYINT_BIGINT` (`tinyint`,`bigint`),
45-
CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`)
45+
CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`)
4646
REFERENCES `reference_table` (`tinyint_ref`) ON DELETE NO ACTION
4747
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
4848
];

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
*/
66
return [
77
'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
8-
`int_auto_increment_with_nullable` int(12) unsigned NOT NULL AUTO_INCREMENT,
8+
`int_auto_increment_with_nullable` int(10) unsigned NOT NULL AUTO_INCREMENT,
99
UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
1010
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
1111
'reference_table' => 'CREATE TABLE `reference_table` (
1212
`tinyint_ref` tinyint(7) NOT NULL AUTO_INCREMENT,
13-
`tinyint_without_padding` tinyint(2) NOT NULL DEFAULT \'0\',
13+
`tinyint_without_padding` tinyint(4) NOT NULL DEFAULT \'0\',
1414
`bigint_without_padding` bigint(20) NOT NULL DEFAULT \'0\',
1515
`integer_without_padding` int(11) NOT NULL DEFAULT \'0\',
1616
`smallint_with_big_padding` smallint(254) NOT NULL DEFAULT \'0\',
@@ -39,7 +39,7 @@
3939
`varbinary_rename` varbinary(255) DEFAULT \'10101\',
4040
UNIQUE KEY `TEST_TABLE_SMALLINT_BIGINT` (`smallint`,`bigint`),
4141
KEY `TEST_TABLE_TINYINT_BIGINT` (`tinyint`,`bigint`),
42-
CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`)
42+
CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`)
4343
REFERENCES `reference_table` (`tinyint_ref`) ON DELETE NO ACTION
4444
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
4545
];

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

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
// @codingStandardsIgnoreFile
77
return [
88
'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
9-
`int_auto_increment_with_nullable` int(11) unsigned NOT NULL AUTO_INCREMENT,
10-
`int_disabled_auto_increment` smallint(6) unsigned DEFAULT 0,
9+
`int_auto_increment_with_nullable` int(10) unsigned NOT NULL AUTO_INCREMENT,
10+
`int_disabled_auto_increment` smallint(5) unsigned DEFAULT 0,
1111
UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
1212
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
1313
'reference_table' => 'CREATE TABLE `reference_table` (
14-
`tinyint_ref` tinyint(2) NOT NULL AUTO_INCREMENT,
15-
`tinyint_without_padding` tinyint(2) NOT NULL DEFAULT 0,
14+
`tinyint_ref` tinyint(4) NOT NULL AUTO_INCREMENT,
15+
`tinyint_without_padding` tinyint(4) NOT NULL DEFAULT 0,
1616
`bigint_without_padding` bigint(20) NOT NULL DEFAULT 0,
1717
`smallint_without_padding` smallint(6) NOT NULL DEFAULT 0,
1818
`integer_without_padding` int(11) NOT NULL DEFAULT 0,
1919
`smallint_with_big_padding` smallint(6) NOT NULL DEFAULT 0,
2020
`smallint_without_default` smallint(6) DEFAULT NULL,
2121
`int_without_unsigned` int(11) DEFAULT NULL,
22-
`int_unsigned` int(11) unsigned DEFAULT NULL,
22+
`int_unsigned` int(10) unsigned DEFAULT NULL,
2323
`bigint_default_nullable` bigint(20) unsigned DEFAULT 1,
2424
`bigint_not_default_not_nullable` bigint(20) unsigned NOT NULL,
2525
`smallint_ref` smallint(6) NOT NULL DEFAULT 0,
@@ -28,7 +28,7 @@
2828
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
2929
'test_table' => 'CREATE TABLE `test_table` (
3030
`smallint` smallint(6) DEFAULT NULL,
31-
`tinyint` tinyint(2) DEFAULT NULL,
31+
`tinyint` tinyint(4) DEFAULT NULL,
3232
`bigint` bigint(20) DEFAULT 0,
3333
`float` float(12,10) DEFAULT 0.0000000000,
3434
`double` double(245,10) DEFAULT 11111111.1111110000,
@@ -43,18 +43,15 @@
4343
`mediumblob` mediumblob DEFAULT NULL,
4444
`blob` blob DEFAULT NULL,
4545
`boolean` tinyint(1) DEFAULT NULL,
46-
`integer_main` int(11) unsigned DEFAULT NULL,
46+
`integer_main` int(10) unsigned DEFAULT NULL,
4747
`smallint_main` smallint(6) NOT NULL DEFAULT 0,
4848
UNIQUE KEY `TEST_TABLE_SMALLINT_FLOAT` (`smallint`,`float`),
4949
UNIQUE KEY `TEST_TABLE_DOUBLE` (`double`),
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/declarative_installer/constraint_modification.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
// @codingStandardsIgnoreFile
77
return [
88
'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
9-
`int_auto_increment_with_nullable` int(11) unsigned NOT NULL AUTO_INCREMENT,
10-
`int_disabled_auto_increment` smallint(6) unsigned DEFAULT \'0\',
9+
`int_auto_increment_with_nullable` int(10) unsigned NOT NULL AUTO_INCREMENT,
10+
`int_disabled_auto_increment` smallint(5) unsigned DEFAULT \'0\',
1111
UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
1212
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
1313
'reference_table' => 'CREATE TABLE `reference_table` (
14-
`tinyint_ref` tinyint(2) NOT NULL AUTO_INCREMENT,
15-
`tinyint_without_padding` tinyint(2) NOT NULL DEFAULT \'0\',
14+
`tinyint_ref` tinyint(4) NOT NULL AUTO_INCREMENT,
15+
`tinyint_without_padding` tinyint(4) NOT NULL DEFAULT \'0\',
1616
`bigint_without_padding` bigint(20) NOT NULL DEFAULT \'0\',
1717
`smallint_without_padding` smallint(6) NOT NULL DEFAULT \'0\',
1818
`integer_without_padding` int(11) NOT NULL DEFAULT \'0\',
1919
`smallint_with_big_padding` smallint(6) NOT NULL DEFAULT \'0\',
2020
`smallint_without_default` smallint(6) DEFAULT NULL,
2121
`int_without_unsigned` int(11) DEFAULT NULL,
22-
`int_unsigned` int(11) unsigned DEFAULT NULL,
22+
`int_unsigned` int(10) unsigned DEFAULT NULL,
2323
`bigint_default_nullable` bigint(20) unsigned DEFAULT \'1\',
2424
`bigint_not_default_not_nullable` bigint(20) unsigned NOT NULL,
2525
`smallint_ref` smallint(6) NOT NULL DEFAULT \'0\',
@@ -28,7 +28,7 @@
2828
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
2929
'test_table' => 'CREATE TABLE `test_table` (
3030
`smallint` smallint(6) DEFAULT NULL,
31-
`tinyint` tinyint(2) DEFAULT NULL,
31+
`tinyint` tinyint(4) DEFAULT NULL,
3232
`bigint` bigint(20) DEFAULT \'0\',
3333
`float` float(12,10) DEFAULT \'0.0000000000\',
3434
`double` double(245,10) DEFAULT \'11111111.1111110000\',
@@ -43,18 +43,18 @@
4343
`mediumblob` mediumblob,
4444
`blob` blob,
4545
`boolean` tinyint(1) DEFAULT NULL,
46-
`integer_main` int(11) unsigned DEFAULT NULL,
46+
`integer_main` int(10) unsigned DEFAULT NULL,
4747
`smallint_main` smallint(6) NOT NULL DEFAULT \'0\',
4848
UNIQUE KEY `TEST_TABLE_SMALLINT_FLOAT` (`smallint`,`float`),
4949
UNIQUE KEY `TEST_TABLE_DOUBLE` (`double`),
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`)
53+
CONSTRAINT `FK_FB77604C299EB8612D01E4AF8D9931F2` FOREIGN KEY (`integer_main`)
5454
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`)
55+
CONSTRAINT `TEST_TABLE_SMALLINT_MAIN_REFERENCE_TABLE_SMALLINT_REF` FOREIGN KEY (`smallint_main`)
5656
REFERENCES `reference_table` (`smallint_ref`) ON DELETE CASCADE,
57-
CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`)
57+
CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`)
5858
REFERENCES `reference_table` (`tinyint_ref`) ON DELETE SET NULL
5959
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
6060
];

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
*/
66
return [
77
'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
8-
`int_auto_increment_with_nullable` int(12) unsigned NOT NULL AUTO_INCREMENT,
9-
`int_disabled_auto_increment` smallint(12) unsigned DEFAULT \'0\',
8+
`int_auto_increment_with_nullable` int(10) unsigned NOT NULL AUTO_INCREMENT,
9+
`int_disabled_auto_increment` smallint(10) unsigned DEFAULT \'0\',
1010
UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
1111
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
1212
'reference_table' => 'CREATE TABLE `reference_table` (
1313
`tinyint_ref` tinyint(7) NOT NULL AUTO_INCREMENT,
14-
`tinyint_without_padding` tinyint(2) NOT NULL DEFAULT \'0\',
14+
`tinyint_without_padding` tinyint(4) NOT NULL DEFAULT \'0\',
1515
`bigint_without_padding` bigint(20) NOT NULL DEFAULT \'0\',
1616
`smallint_without_padding` smallint(5) NOT NULL DEFAULT \'0\',
1717
`integer_without_padding` int(11) NOT NULL DEFAULT \'0\',
@@ -41,7 +41,7 @@
4141
`boolean` tinyint(1) DEFAULT NULL,
4242
UNIQUE KEY `TEST_TABLE_SMALLINT_BIGINT` (`smallint`,`bigint`),
4343
KEY `TEST_TABLE_TINYINT_BIGINT` (`tinyint`,`bigint`),
44-
CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`)
44+
CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`)
4545
REFERENCES `reference_table` (`tinyint_ref`) ON DELETE NO ACTION
4646
) ENGINE=InnoDB DEFAULT CHARSET=utf8',
4747
];

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
return [
77
'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
8-
`int_auto_increment_with_nullable` int(11) unsigned NOT NULL AUTO_INCREMENT,
9-
`int_disabled_auto_increment` smallint(6) unsigned DEFAULT 0,
8+
`int_auto_increment_with_nullable` int(10) unsigned NOT NULL AUTO_INCREMENT,
9+
`int_disabled_auto_increment` smallint(5) unsigned DEFAULT 0,
1010
UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
1111
) ENGINE=InnoDB DEFAULT CHARSET=utf8'
1212
];

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
return [
77
'auto_increment_test' => 'CREATE TABLE `auto_increment_test` (
8-
`int_auto_increment_with_nullable` int(11) unsigned NOT NULL AUTO_INCREMENT,
9-
`int_disabled_auto_increment` smallint(6) unsigned DEFAULT \'0\',
8+
`int_auto_increment_with_nullable` int(10) unsigned NOT NULL AUTO_INCREMENT,
9+
`int_disabled_auto_increment` smallint(5) unsigned DEFAULT \'0\',
1010
UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
1111
) ENGINE=InnoDB DEFAULT CHARSET=utf8'
1212
];

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
// @codingStandardsIgnoreFile
7+
return ['CREATE TABLE `reference_table` (
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 ,
19+
CONSTRAINT PRIMARY KEY (`tinyint_ref`)
20+
) ENGINE=innodb DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_general_ci
21+
22+
CREATE TABLE `auto_increment_test` (
23+
`int_auto_increment_with_nullable` int UNSIGNED NOT NULL AUTO_INCREMENT ,
24+
`int_disabled_auto_increment` smallint UNSIGNED NULL DEFAULT 0 ,
25+
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
27+
28+
CREATE TABLE `test_table` (
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,
47+
INDEX `TEST_TABLE_TINYINT_BIGINT` (`tinyint`,`bigint`)
48+
) ENGINE=innodb DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_general_ci
49+
50+
CREATE TABLE `patch_list` (
51+
`patch_id` int NOT NULL AUTO_INCREMENT COMMENT "Patch Auto Increment",
52+
`patch_name` varchar(1024) NOT NULL COMMENT "Patch Class Name",
53+
CONSTRAINT PRIMARY KEY (`patch_id`)
54+
) ENGINE=innodb DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_general_ci COMMENT="List of data/schema patches"
55+
56+
'];

‎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(2) NOT NULL AUTO_INCREMENT ,
9-
`tinyint_without_padding` tinyint(2) 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(11) 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(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 ,
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(11) UNSIGNED NOT NULL AUTO_INCREMENT ,
24-
`int_disabled_auto_increment` smallint(6) UNSIGNED NULL DEFAULT 0 ,
23+
`int_auto_increment_with_nullable` int(10) UNSIGNED NOT NULL AUTO_INCREMENT ,
24+
`int_disabled_auto_increment` smallint(5) 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(2) 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(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,
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(11) 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: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
// @codingStandardsIgnoreFile
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
8+
9+
ALTER TABLE `auto_increment_test` MODIFY COLUMN `int_auto_increment_with_nullable` int UNSIGNED NULL
10+
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
12+
13+
'];

0 commit comments

Comments
 (0)