Skip to content

Commit 3d4b808

Browse files
committed
AC-9755:Set default collation to utf8mb4 for MySQL
1 parent f16d0e4 commit 3d4b808

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
1616
'store_owner' => 'CREATE TABLE `store_owner` (
1717
`owner_id` smallint(6) NOT NULL AUTO_INCREMENT,
18-
`store_owner_name` varchar(255) DEFAULT NULL COMMENT \'Store Owner Name\',
18+
`store_owner_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT \'Store Owner Name\',
1919
PRIMARY KEY (`owner_id`)
2020
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT=\'Store owner information\''
2121
],
2222
'after' => [
2323
'store' => 'CREATE TABLE `store` (
24-
`store_owner` varchar(255) DEFAULT NULL COMMENT \'Store Owner Name\'
24+
`store_owner` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT \'Store Owner Name\'
2525
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci'
2626
]
2727
];

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
`date` date NULL ,
3838
`timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ,
3939
`datetime` datetime NULL DEFAULT 0 ,
40-
`longtext` longtext NULL ,
41-
`mediumtext` mediumtext NULL ,
42-
`varchar` varchar(254) NULL ,
43-
`char` char(255) NULL ,
40+
`longtext` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL ,
41+
`mediumtext` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL ,
42+
`varchar` varchar(254) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL ,
43+
`char` char(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL ,
4444
`mediumblob` mediumblob NULL ,
4545
`blob` blob NULL ,
4646
`boolean` BOOLEAN NULL ,
@@ -51,7 +51,7 @@
5151
5252
CREATE TABLE `patch_list` (
5353
`patch_id` int NOT NULL AUTO_INCREMENT COMMENT "Patch Auto Increment",
54-
`patch_name` varchar(1024) NOT NULL COMMENT "Patch Class Name",
54+
`patch_name` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT "Patch Class Name",
5555
CONSTRAINT PRIMARY KEY (`patch_id`)
5656
) ENGINE=innodb DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci COMMENT="List of data/schema patches"
5757

0 commit comments

Comments
 (0)