Skip to content

Commit f409c93

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into comprs_v2
2 parents 54d8a14 + 7b336d0 commit f409c93

File tree

30 files changed

+538
-132
lines changed

30 files changed

+538
-132
lines changed

‎app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2020 Adobe
4+
* All Rights Reserved.
55
*/
66

77
declare(strict_types=1);
88

99
namespace Magento\Theme\Model\Indexer\Design;
1010

11+
use Magento\Framework\App\ObjectManager;
1112
use Magento\Framework\App\ResourceConnection;
1213
use Magento\Framework\Indexer\IndexStructureInterface;
1314
use Magento\Framework\Indexer\SaveHandler\Batch;
@@ -16,6 +17,7 @@
1617
use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
1718
use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
1819
use Magento\Framework\Search\Request\Dimension;
20+
use Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table as DtoFactoriesTable;
1921

2022
class IndexerHandler extends Grid
2123
{
@@ -24,6 +26,21 @@ class IndexerHandler extends Grid
2426
*/
2527
private $flatScopeResolver;
2628

29+
/***
30+
* check for old collation
31+
*/
32+
private const OLDCOLLATION = 'utf8_general_ci|utf8mb3_general_ci';
33+
34+
/***
35+
* table design_config_grid_flat
36+
*/
37+
private const DESIGN_CONFIG_GRID_FLAT = "design_config_grid_flat";
38+
39+
/***
40+
* @var DtoFactoriesTable
41+
*/
42+
private $columnConfig;
43+
2744
/**
2845
* @param IndexStructureInterface $indexStructure
2946
* @param ResourceConnection $resource
@@ -32,6 +49,7 @@ class IndexerHandler extends Grid
3249
* @param FlatScopeResolver $flatScopeResolver
3350
* @param array $data
3451
* @param int $batchSize
52+
* @param DtoFactoriesTable|null $dtoFactoriesTable
3553
*/
3654
public function __construct(
3755
IndexStructureInterface $indexStructure,
@@ -40,7 +58,8 @@ public function __construct(
4058
IndexScopeResolver $indexScopeResolver,
4159
FlatScopeResolver $flatScopeResolver,
4260
array $data,
43-
$batchSize = 100
61+
$batchSize = 100,
62+
?DtoFactoriesTable $dtoFactoriesTable = null
4463
) {
4564
parent::__construct(
4665
$indexStructure,
@@ -51,8 +70,8 @@ public function __construct(
5170
$data,
5271
$batchSize
5372
);
54-
5573
$this->flatScopeResolver = $flatScopeResolver;
74+
$this->columnConfig = $dtoFactoriesTable ?: ObjectManager::getInstance()->get(DtoFactoriesTable::class);
5675
}
5776

5877
/**
@@ -67,6 +86,27 @@ public function cleanIndex($dimensions)
6786

6887
if ($this->connection->isTableExists($tableName)) {
6988
$this->connection->delete($tableName);
89+
// change the charset to utf8mb4
90+
if ($tableName === self::DESIGN_CONFIG_GRID_FLAT) {
91+
$getTableSchema = $this->connection->showTableStatus($tableName) ?? '';
92+
if (isset($getTableSchema['Collation']) &&
93+
preg_match('/\b('. self::OLDCOLLATION .')\b/', $getTableSchema['Collation'])) {
94+
$charset = $this->columnConfig->getDefaultCharset();
95+
$collate = $this->columnConfig->getDefaultCollation();
96+
$columnEncoding = " CHARACTER SET ".$charset." COLLATE ".$collate;
97+
$this->connection->query(
98+
sprintf(
99+
'ALTER TABLE `%s` MODIFY COLUMN `theme_theme_id` varchar(255) %s %s,
100+
DEFAULT CHARSET=%s, DEFAULT COLLATE=%s',
101+
$tableName,
102+
$columnEncoding,
103+
"COMMENT 'Theme_theme_id'",
104+
$charset,
105+
$collate
106+
)
107+
);
108+
}
109+
}
70110
} else {
71111
$this->indexStructure->create($this->getIndexName(), $this->fields, $dimensions);
72112
}

‎app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -22,6 +22,7 @@
2222
use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
2323
use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
2424
use Magento\Framework\Indexer\StructureFactory;
25+
use Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table as DtoFactoriesTable;
2526
use Magento\Theme\Model\Data\Design\Config as DesignConfig;
2627
use Magento\Theme\Model\Indexer\Design\Config;
2728
use Magento\Theme\Model\ResourceModel\Design\Config\Scope\CollectionFactory;
@@ -91,6 +92,10 @@ class ConfigTest extends TestCase
9192
* @var CollectionFactory|MockObject
9293
*/
9394
private $collectionFactory;
95+
/***
96+
* @var DtoFactoriesTable|MockObject
97+
*/
98+
private $dtoFactoriesTable;
9499

95100
protected function setUp(): void
96101
{
@@ -132,6 +137,9 @@ protected function setUp(): void
132137
->getMock();
133138
$this->indexerFieldset = $this->getMockBuilder(FieldsetInterface::class)
134139
->getMockForAbstractClass();
140+
$this->dtoFactoriesTable = $this->getMockBuilder(DtoFactoriesTable::class)
141+
->disableOriginalConstructor()
142+
->getMock();
135143
}
136144

137145
/**
@@ -171,7 +179,9 @@ private function getDesignConfigIndexerModel(): Config
171179
[
172180
'fieldsets' => [],
173181
'indexer_id' => DesignConfig::DESIGN_CONFIG_GRID_INDEXER_ID
174-
]
182+
],
183+
[],
184+
$this->dtoFactoriesTable
175185
);
176186

177187
$this->saveHandlerFactory->expects($this->any())

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
`int_auto_increment_with_nullable` int(10) unsigned NOT NULL AUTO_INCREMENT,
1212
`int_disabled_auto_increment` smallint(5) unsigned DEFAULT 0,
1313
UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
14-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
14+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
1515
'reference_table' => 'CREATE TABLE `reference_table` (
1616
`tinyint_ref` tinyint(4) NOT NULL AUTO_INCREMENT,
1717
`tinyint_without_padding` tinyint(4) NOT NULL DEFAULT 0,
@@ -27,7 +27,7 @@
2727
`smallint_ref` smallint(6) NOT NULL DEFAULT 0,
2828
PRIMARY KEY (`tinyint_ref`,`smallint_ref`),
2929
UNIQUE KEY `REFERENCE_TABLE_SMALLINT_REF` (`smallint_ref`)
30-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
30+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
3131
'test_table' => 'CREATE TABLE `test_table` (
3232
`smallint` smallint(6) DEFAULT NULL,
3333
`tinyint` tinyint(4) DEFAULT NULL,
@@ -55,5 +55,5 @@
5555
CONSTRAINT `FK_FB77604C299EB8612D01E4AF8D9931F2` FOREIGN KEY (`integer_main`) REFERENCES `auto_increment_test` (`int_auto_increment_with_nullable`) ON DELETE CASCADE,
5656
CONSTRAINT `TEST_TABLE_SMALLINT_MAIN_REFERENCE_TABLE_SMALLINT_REF` FOREIGN KEY (`smallint_main`) REFERENCES `reference_table` (`smallint_ref`) ON DELETE CASCADE,
5757
CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`) REFERENCES `reference_table` (`tinyint_ref`) ON DELETE SET NULL
58-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
58+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
5959
];

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
`int_auto_increment_with_nullable` int unsigned NOT NULL AUTO_INCREMENT,
1212
`int_disabled_auto_increment` smallint unsigned DEFAULT \'0\',
1313
UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
14-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
14+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
1515
'reference_table' => 'CREATE TABLE `reference_table` (
1616
`tinyint_ref` tinyint NOT NULL AUTO_INCREMENT,
1717
`tinyint_without_padding` tinyint NOT NULL DEFAULT \'0\',
@@ -27,7 +27,7 @@
2727
`smallint_ref` smallint NOT NULL DEFAULT \'0\',
2828
PRIMARY KEY (`tinyint_ref`,`smallint_ref`),
2929
UNIQUE KEY `REFERENCE_TABLE_SMALLINT_REF` (`smallint_ref`)
30-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
30+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
3131
'test_table' => 'CREATE TABLE `test_table` (
3232
`smallint` smallint DEFAULT NULL,
3333
`tinyint` tinyint DEFAULT NULL,
@@ -38,10 +38,10 @@
3838
`date` date DEFAULT NULL,
3939
`timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
4040
`datetime` datetime DEFAULT \'0000-00-00 00:00:00\',
41-
`longtext` longtext,
42-
`mediumtext` mediumtext,
43-
`varchar` varchar(254) DEFAULT NULL,
44-
`char` char(255) DEFAULT NULL,
41+
`longtext` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
42+
`mediumtext` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
43+
`varchar` varchar(254) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
44+
`char` char(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
4545
`mediumblob` mediumblob,
4646
`blob` blob,
4747
`boolean` tinyint(1) DEFAULT NULL,
@@ -55,5 +55,5 @@
5555
CONSTRAINT `FK_FB77604C299EB8612D01E4AF8D9931F2` FOREIGN KEY (`integer_main`) REFERENCES `auto_increment_test` (`int_auto_increment_with_nullable`) ON DELETE CASCADE,
5656
CONSTRAINT `TEST_TABLE_SMALLINT_MAIN_REFERENCE_TABLE_SMALLINT_REF` FOREIGN KEY (`smallint_main`) REFERENCES `reference_table` (`smallint_ref`) ON DELETE CASCADE,
5757
CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`) REFERENCES `reference_table` (`tinyint_ref`) ON DELETE SET NULL
58-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
58+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
5959
];

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
`store_owner_id` smallint(6) 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=utf8mb3 COLLATE=utf8mb3_general_ci',
15+
) 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,
1818
`store_owner_name` varchar(255) DEFAULT NULL COMMENT \'Store Owner Name\',
1919
PRIMARY KEY (`owner_id`)
20-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT=\'Store owner information\''
20+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci 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=utf8mb3 COLLATE=utf8mb3_general_ci'
25+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci'
2626
]
27-
];
27+
];

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

Lines changed: 5 additions & 5 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=utf8mb3',
15+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
1616
'store_owner' => 'CREATE TABLE `store_owner` (
1717
`owner_id` smallint 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`)
20-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT=\'Store owner information\''
20+
) 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\'
25-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3'
24+
`store_owner` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT \'Store Owner Name\'
25+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci'
2626
]
2727
];

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2023 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -10,5 +10,5 @@
1010
`int_auto_increment_with_nullable` int(10) unsigned NOT NULL AUTO_INCREMENT,
1111
`int_disabled_auto_increment` smallint(5) unsigned DEFAULT 0,
1212
UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
13-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci'
13+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci'
1414
];

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2022 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -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=utf8mb3'
13+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci'
1414
];

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2023 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

88
return [
99
'before' => 'CREATE TABLE `some_table` (
1010
`some_column` varchar(255) DEFAULT NULL COMMENT \'Some Column Name\'
11-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
11+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
1212
'after' => 'CREATE TABLE `some_table_renamed` (
1313
`some_column` varchar(255) DEFAULT NULL COMMENT \'Some Column Name\'
14-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
14+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
1515
];

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2022 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

88
return [
99
'before' => 'CREATE TABLE `some_table` (
10-
`some_column` varchar(255) DEFAULT NULL COMMENT \'Some Column Name\'
11-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
10+
`some_column` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT \'Some Column Name\'
11+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
1212
'after' => 'CREATE TABLE `some_table_renamed` (
13-
`some_column` varchar(255) DEFAULT NULL COMMENT \'Some Column Name\'
14-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
13+
`some_column` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT \'Some Column Name\'
14+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
1515
];

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
`bigint_default_nullable` bigint UNSIGNED NULL DEFAULT 1 ,
2020
`bigint_not_default_not_nullable` bigint UNSIGNED NOT NULL ,
2121
CONSTRAINT PRIMARY KEY (`tinyint_ref`)
22-
) ENGINE=innodb DEFAULT CHARSET=utf8mb3 DEFAULT COLLATE=utf8mb3_general_ci
22+
) ENGINE=innodb DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci
2323
2424
CREATE TABLE `auto_increment_test` (
2525
`int_auto_increment_with_nullable` int UNSIGNED NOT NULL AUTO_INCREMENT ,
2626
`int_disabled_auto_increment` smallint UNSIGNED NULL DEFAULT 0 ,
2727
CONSTRAINT `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` UNIQUE KEY (`int_auto_increment_with_nullable`)
28-
) ENGINE=innodb DEFAULT CHARSET=utf8mb3 DEFAULT COLLATE=utf8mb3_general_ci
28+
) ENGINE=innodb DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci
2929
3030
CREATE TABLE `test_table` (
3131
`smallint` smallint NOT NULL AUTO_INCREMENT ,
@@ -37,22 +37,22 @@
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 ,
4747
CONSTRAINT `TEST_TABLE_SMALLINT_BIGINT` UNIQUE KEY (`smallint`,`bigint`),
4848
CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`) REFERENCES `reference_table` (`tinyint_ref`) ON DELETE NO ACTION,
4949
INDEX `TEST_TABLE_TINYINT_BIGINT` (`tinyint`,`bigint`)
50-
) ENGINE=innodb DEFAULT CHARSET=utf8mb3 DEFAULT COLLATE=utf8mb3_general_ci
50+
) ENGINE=innodb DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci
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`)
56-
) ENGINE=innodb DEFAULT CHARSET=utf8mb3 DEFAULT COLLATE=utf8mb3_general_ci COMMENT="List of data/schema patches"
56+
) ENGINE=innodb DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci COMMENT="List of data/schema patches"
5757
5858
'];

0 commit comments

Comments
 (0)