AC-9755:Set default collation to utf8mb4 for MySQL

Author: glo17680

lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php

@@ -149,6 +149,16 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface, Rese
      */
     private const COLUMN_TYPE = ['varchar', 'char', 'text', 'mediumtext', 'longtext'];
 
+    /**
+     * const for charset
+     */
+    private const CHARSET = "utf8mb4";
+
+    /**
+     * const for collation
+     */
+    private const COLLATION = "utf8mb4_general_ci";
+
     /**
      * MySQL column - Table DDL type pairs
      *
@@ -1258,7 +1268,11 @@ public function modifyColumn($tableName, $columnName, $definition, $flushData =
         if (is_array($definition)) {
             $definition = $this->_getColumnDefinition($definition);
         }
-
+        // Add charset and collation for DBC failures
+        if(!empty($definition)) {
+            $type = explode(' ', trim($definition));
+            $definition = $this->applyCharsetAndCollation($type[0], $definition, 1);
+        }
         $sql = sprintf(
             'ALTER TABLE %s MODIFY COLUMN %s %s',
             $this->quoteIdentifier($tableName),
@@ -2433,20 +2447,13 @@ protected function _getColumnsDefinition(Table $table)
                 $columnDefinition
             );
         }
-
+        // Adding charset and collation for DBC failures
         if(count($definition)) {
             foreach ($definition as $index => $columnDefinition) {
                 $type = explode(' ', trim($columnDefinition));
-                $pattern = '/\b(' . implode('|', array_map('preg_quote', self::COLUMN_TYPE)) . ')\b/i';
-                if (preg_match($pattern, $type[1]) === 1) {
-                    $charsets = 'CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci';
-                    $columnsAttribute = explode(' ', trim($columnDefinition));
-                    array_splice($columnsAttribute, 2, 0, $charsets);
-                    $definition[$index] = implode(' ', $columnsAttribute);
-                }
+                $definition[$index] = $this->applyCharsetAndCollation($type[1], $columnDefinition, 2);
             }
         }
-
         // PRIMARY KEY
         if (!empty($primary)) {
             asort($primary, SORT_NUMERIC);
@@ -4301,4 +4308,24 @@ public function __debugInfo()
     {
         return [];
     }
+
+    /***
+     * Adding charset and collation for DBC failures
+     *
+     * @param $columnType
+     * @param $definition
+     * @param $position
+     * @return string
+     */
+    private function applyCharsetAndCollation($columnType, $definition, $position) : string
+    {
+        $pattern = '/\b(' . implode('|', array_map('preg_quote', self::COLUMN_TYPE)) . ')\b/i';
+        if (preg_match($pattern, $columnType) === 1) {
+            $charsets = 'CHARACTER SET ' . self::CHARSET. ' COLLATE ' . self::COLLATION;
+            $columnsAttribute = explode(' ', trim($definition));
+            array_splice($columnsAttribute, $position, 0, $charsets);
+            return implode(' ', $columnsAttribute);
+        }
+        return $definition;
+    }
 }

lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaWriter.php

@@ -396,7 +396,7 @@ private function removeConstraint(array $statementsSql): array
     }
 
     /***
-     * Adding charset and collation at column level after column name and column type
+     * Adding charset and collation for DBC failures
      *
      * @param string $columnDefinition
      * @return string

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

@@ -275,9 +275,10 @@ class Installer
     private const OLDCHARSET = 'utf8mb3';
 
     /***
-     * charset and collation for column level
+     * Charset and collation for column level
+     * Adding charset and collation for DBC failures
      */
-    private const COLUMN_ENCODING = " CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci";
+    private const COLUMN_ENCODING = " CHARACTER SET ".self::CHARSET." COLLATE ".self::COLLATION;
 
     /**
      * Constructor