AC-9755:Set default collation to utf8mb4 for MySQL

Author: glo17680

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

@@ -29,7 +29,7 @@ class IndexerHandler extends Grid
     /***
      * Old Charset for flat table
      */
-    private const OLDCHARSET = 'utf8mb3';
+    private const OLDCHARSET = 'utf8|utf8mb3';
 
     /***
      * table design_config_grid_flat
@@ -88,9 +88,8 @@ public function cleanIndex($dimensions)
             $this->connection->delete($tableName);
             // change the charset to utf8mb4
             if ($tableName === self::DESIGN_CONFIG_GRID_FLAT) {
-                $getTableSchema = $this->connection->showTableStatus($tableName);
-                $collation = $getTableSchema['Collation'] ?? '';
-                if (str_contains($collation, self::OLDCHARSET)) {
+                $getTableSchema = $this->connection->getCreateTable($tableName) ?? '';
+                if (preg_match('/\b('. self::OLDCHARSET .')\b/', $getTableSchema)) {
                     $charset = $this->columnConfig->getDefaultCharset();
                     $collate = $this->columnConfig->getDefaultCollation();
                     $columnEncoding = " CHARACTER SET ".$charset." COLLATE ".$collate;

lib/internal/Magento/Framework/Mview/View/Changelog.php

@@ -69,7 +69,7 @@ class Changelog implements ChangelogInterface
     /***
      * Old Charset for cl tables
      */
-    private const OLDCHARSET = 'utf8mb3';
+    private const OLDCHARSET = 'utf8|utf8mb3';
 
     /***
      * @var DtoFactoriesTable|null
@@ -149,7 +149,7 @@ public function create()
         } else {
             // change the charset to utf8mb4
             $getTableSchema = $this->connection->getCreateTable($changelogTableName) ?? '';
-            if (str_contains($getTableSchema, self::OLDCHARSET)) {
+            if (preg_match('/\b('. self::OLDCHARSET .')\b/', $getTableSchema)) {
                 $charset = $this->columnConfig->getDefaultCharset();
                 $collate = $this->columnConfig->getDefaultCollation();
                 $this->connection->query(

lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/Factories/Table.php

@@ -48,7 +48,7 @@ class Table implements FactoryInterface
      * @var array|string[]
      */
     private static array $defaultCharset = [
-        '10.4.' => 'utf8',
+        '10.4.' => 'utf8mb4',
         '10.6.' => 'utf8mb4',
         '11.4.' => 'utf8mb4',
         'mysql_8_29' => 'utf8mb4',
@@ -59,7 +59,7 @@ class Table implements FactoryInterface
      * @var array|string[]
      */
     private static array $defaultCollation = [
-        '10.4.' => 'utf8_general_ci',
+        '10.4.' => 'utf8mb4_general_ci',
         '10.6.' => 'utf8mb4_general_ci',
         '11.4.' => 'utf8mb4_general_ci',
         'mysql_8_29' => 'utf8mb4_general_ci',

setup/src/Magento/Setup/Model/Installer.php

@@ -263,7 +263,7 @@ class Installer
     /***
      * Old Charset for cl tables
      */
-    private const OLDCHARSET = 'utf8mb3';
+    private const OLDCHARSET = 'utf8|utf8mb3';
 
     /***
      * @var DtoFactoriesTable
@@ -662,7 +662,7 @@ private function setupModuleRegistry(SchemaSetupInterface $setup)
         } else {
             // change the charset to utf8mb4
             $getTableSchema = $connection->getCreateTable($setup->getTable('setup_module')) ?? '';
-            if (str_contains($getTableSchema, self::OLDCHARSET)) {
+            if (preg_match('/\b('. self::OLDCHARSET .')\b/', $getTableSchema)) {
                 $tableName = $setup->getTable('setup_module');
                 $columns = ['module' => ['varchar(50)',''],
                             'schema_version' => ['varchar(50)',''],
@@ -731,7 +731,7 @@ private function setupSessionTable(
         } else {
             // change the charset to utf8mb4
             $getTableSchema = $connection->getCreateTable($setup->getTable('session')) ?? '';
-            if (str_contains($getTableSchema, self::OLDCHARSET)) {
+            if (preg_match('/\b('. self::OLDCHARSET .')\b/', $getTableSchema)) {
                 $tableName = $setup->getTable('session');
                 $columns = ['session_id' => ['varchar(255)','']];
                 $this->updateDBTable($tableName, $columns, $connection);
@@ -794,7 +794,7 @@ private function setupCacheTable(
         } else {
             // change the charset to utf8mb4
             $getTableSchema = $connection->getCreateTable($setup->getTable('cache')) ?? '';
-            if (str_contains($getTableSchema, self::OLDCHARSET)) {
+            if (preg_match('/\b('. self::OLDCHARSET .')\b/', $getTableSchema)) {
                 $tableName = $setup->getTable('cache');
                 $columns = ['id' => ['varchar(200)','']];
                 $this->updateDBTable($tableName, $columns, $connection);
@@ -839,7 +839,7 @@ private function setupCacheTagTable(
         } else {
             // change the charset to utf8mb4
             $getTableSchema = $connection->getCreateTable($setup->getTable('cache_tag')) ?? '';
-            if (str_contains($getTableSchema, self::OLDCHARSET)) {
+            if (preg_match('/\b('. self::OLDCHARSET .')\b/', $getTableSchema)) {
                 $tableName = $setup->getTable('cache_tag');
                 $columns = ['tag' => ['varchar(100)',''],'cache_id' => ['varchar(200)','']];
                 $this->updateDBTable($tableName, $columns, $connection);
@@ -904,7 +904,7 @@ private function setupFlagTable(
             $this->updateColumnType($connection, $tableName, 'flag_data', 'mediumtext');
             // change the charset to utf8mb4
             $getTableSchema = $connection->getCreateTable($tableName) ?? '';
-            if (str_contains($getTableSchema, self::OLDCHARSET)) {
+            if (preg_match('/\b('. self::OLDCHARSET .')\b/', $getTableSchema)) {
                 $columns = ['flag_code' => ['varchar(255)','NOT NULL'],'flag_data' => ['mediumtext','']];
                 $this->updateDBTable($tableName, $columns, $connection);
             }