AC-9755:Set default collation to utf8mb4 for MySQL

Author: glo17680

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

@@ -8,6 +8,7 @@
 
 namespace Magento\Theme\Model\Indexer\Design;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\Indexer\SaveHandler\Batch;
@@ -16,6 +17,7 @@
 use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\Framework\Search\Request\Dimension;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table as DtoFactoriesTable;
 
 class IndexerHandler extends Grid
 {
@@ -24,16 +26,6 @@ class IndexerHandler extends Grid
      */
     private $flatScopeResolver;
 
-    /***
-     * Charset for flat table
-     */
-    private const CHARSET = 'utf8mb4';
-
-    /***
-     * Collation for flat table
-     */
-    private const COLLATION = 'utf8mb4_general_ci';
-
     /***
      * Old Charset for flat table
      */
@@ -45,9 +37,9 @@ class IndexerHandler extends Grid
     private const DESIGN_CONFIG_GRID_FLAT = "design_config_grid_flat";
 
     /***
-     * charset and collation for column level
+     * @var DtoFactoriesTable
      */
-    private const COLUMN_ENCODING = " CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci";
+    private $columnConfig;
 
     /**
      * @param IndexStructureInterface $indexStructure
@@ -57,6 +49,7 @@ class IndexerHandler extends Grid
      * @param FlatScopeResolver $flatScopeResolver
      * @param array $data
      * @param int $batchSize
+     * @param DtoFactoriesTable|null $dtoFactoriesTable
      */
     public function __construct(
         IndexStructureInterface $indexStructure,
@@ -65,7 +58,8 @@ public function __construct(
         IndexScopeResolver $indexScopeResolver,
         FlatScopeResolver $flatScopeResolver,
         array $data,
-        $batchSize = 100
+        $batchSize = 100,
+        ?DtoFactoriesTable $dtoFactoriesTable = null
     ) {
         parent::__construct(
             $indexStructure,
@@ -77,6 +71,7 @@ public function __construct(
             $batchSize
         );
         $this->flatScopeResolver = $flatScopeResolver;
+        $this->columnConfig = $dtoFactoriesTable ?: ObjectManager::getInstance()->get(DtoFactoriesTable::class);
     }
 
     /**
@@ -96,15 +91,18 @@ public function cleanIndex($dimensions)
                 $getTableSchema = $this->connection->showTableStatus($tableName);
                 $collation = $getTableSchema['Collation'] ?? '';
                 if (str_contains($collation, self::OLDCHARSET)) {
+                    $charset = $this->columnConfig->getDefaultCharset();
+                    $collate = $this->columnConfig->getDefaultCollation();
+                    $columnEncoding = " CHARACTER SET ".$charset." COLLATE ".$collate;
                     $this->connection->query(
                         sprintf(
                             'ALTER TABLE `%s` MODIFY COLUMN `theme_theme_id` varchar(255) %s %s,
                              DEFAULT CHARSET=%s, DEFAULT COLLATE=%s',
                             $tableName,
-                            self::COLUMN_ENCODING,
+                            $columnEncoding,
                             "COMMENT 'Theme_theme_id'",
-                            self::CHARSET,
-                            self::COLLATION
+                            $charset,
+                            $collate
                         )
                     );
                 }

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

@@ -12,6 +12,7 @@
 use Magento\Framework\Exception\RuntimeException;
 use Magento\Framework\Mview\Config;
 use Magento\Framework\Mview\View\AdditionalColumnsProcessor\ProcessorFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table as DtoFactoriesTable;
 use Magento\Framework\Phrase;
 
 /**
@@ -64,36 +65,34 @@ class Changelog implements ChangelogInterface
     private $additionalColumnsProcessorFactory;
 
     /***
-     * Charset for cl tables
-     */
-    private const CHARSET = 'utf8mb4';
-
-    /***
-     * Collation for cl tables
+     * Old Charset for cl tables
      */
-    private const COLLATION = 'utf8mb4_general_ci';
+    private const OLDCHARSET = 'utf8mb3';
 
     /***
-     * Old Charset for cl tables
+     * @var DtoFactoriesTable|null
      */
-    private const OLDCHARSET = 'utf8mb3';
+    private $columnConfig;
 
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param Config $mviewConfig
      * @param ProcessorFactory $additionalColumnsProcessorFactory
+     * @param DtoFactoriesTable|null $dtoFactoriesTable
      * @throws ConnectionException
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
         Config $mviewConfig,
-        ProcessorFactory $additionalColumnsProcessorFactory
+        ProcessorFactory $additionalColumnsProcessorFactory,
+        ?DtoFactoriesTable $dtoFactoriesTable = null
     ) {
         $this->connection = $resource->getConnection();
         $this->resource = $resource;
         $this->checkConnection();
         $this->mviewConfig = $mviewConfig;
         $this->additionalColumnsProcessorFactory = $additionalColumnsProcessorFactory;
+        $this->columnConfig = $dtoFactoriesTable ?: ObjectManager::getInstance()->get(DtoFactoriesTable::class);
     }
 
     /**
@@ -149,12 +148,14 @@ public function create()
             // change the charset to utf8mb4
             $getTableSchema = $this->connection->getCreateTable($changelogTableName) ?? '';
             if (str_contains($getTableSchema, self::OLDCHARSET)) {
+                $charset = $this->columnConfig->getDefaultCharset();
+                $collate = $this->columnConfig->getDefaultCollation();
                 $this->connection->query(
                     sprintf(
                         'ALTER TABLE %s DEFAULT CHARSET=%s, DEFAULT COLLATE=%s',
                         $changelogTableName,
-                        self::CHARSET,
-                        self::COLLATION
+                        $charset,
+                        $collate
                     )
                 );
             }