ACP2E-2844: Issues after upgrading MariaDB to 10.5.1 or higher

Author: Anna Bukatar

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

@@ -1812,13 +1812,8 @@ private function prepareColumnData(array $ddl): array
             }
         }
 
-        /**
-         * Starting from MariaDB 10.5.1 columns with old temporal formats are marked with a \/* mariadb-5.3 *\/
-         * comment in the output of SHOW CREATE TABLE, SHOW COLUMNS, DESCRIBE statements,
-         * as well as in the COLUMN_TYPE column of the INFORMATION_SCHEMA.COLUMNS Table.
-         */
         foreach ($ddl as $key => $columnData) {
-            $ddl[$key]['DATA_TYPE'] = str_replace(' /* mariadb-5.3 */', '', $columnData['DATA_TYPE']);
+            $ddl[$key]['DATA_TYPE'] = $this->sanitizeColumnDataType($columnData['DATA_TYPE']);
         }
 
         return $ddl;
@@ -1975,7 +1970,7 @@ public function modifyColumnByDdl($tableName, $columnName, $definition, $flushDa
     protected function _getColumnTypeByDdl($column)
     {
         // phpstan:ignore
-        switch ($column['DATA_TYPE']) {
+        switch ($this->sanitizeColumnDataType($column['DATA_TYPE'])) {
             case 'bool':
                 return Table::TYPE_BOOLEAN;
             case 'tinytext':
@@ -2012,6 +2007,22 @@ protected function _getColumnTypeByDdl($column)
         return null;
     }
 
+    /**
+     * Remove old temporal format comment from column data type
+     *
+     * @param string $columnType
+     * @return string
+     */
+    private function sanitizeColumnDataType(string $columnType): string
+    {
+        /**
+         * Starting from MariaDB 10.5.1 columns with old temporal formats are marked with a \/* mariadb-5.3 *\/
+         * comment in the output of SHOW CREATE TABLE, SHOW COLUMNS, DESCRIBE statements,
+         * as well as in the COLUMN_TYPE column of the INFORMATION_SCHEMA.COLUMNS Table.
+         */
+        return str_replace(' /* mariadb-5.3 */', '', $columnType);
+    }
+
     /**
      * Change table storage engine
      *
@@ -2584,6 +2595,8 @@ protected function _getColumnDefinition($options, $ddlType = null)
         // detect and validate column type
         if ($ddlType === null) {
             $ddlType = $this->_getDdlType($options);
+        } else {
+            $ddlType = $this->sanitizeColumnDataType($ddlType);
         }
 
         if (empty($ddlType) || !isset($this->_ddlColumnTypes[$ddlType])) {
@@ -3225,7 +3238,7 @@ public function prepareColumnValue(array $column, $value)
             return $value;
         }
 
-        $column['DATA_TYPE'] = str_replace(' /* mariadb-5.3 */', '', $column['DATA_TYPE']);
+        $column['DATA_TYPE'] = $this->sanitizeColumnDataType($column['DATA_TYPE']);
 
         // return original value if invalid column describe data
         if (!isset($column['DATA_TYPE'])) {
@@ -3996,7 +4009,7 @@ protected function _getDdlType($options)
             $ddlType = $options['COLUMN_TYPE'];
         }
 
-        return $ddlType;
+        return $this->sanitizeColumnDataType($ddlType);
     }
 
     /**

lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php

@@ -854,12 +854,12 @@ public function columnDataForTest(): array
 
     /**
      * @param array $actual
-     * @param mixed $expected
+     * @param int|string|\Zend_Db_Expr $expected
      * @dataProvider columnDataAndValueForTest
      * @return void
      * @throws \ReflectionException
      */
-    public function testPrepareColumnValue(array $actual, mixed $expected)
+    public function testPrepareColumnValue(array $actual, int|string|\Zend_Db_Expr $expected)
     {
         $adapter = $this->getMysqlPdoAdapterMock([]);
 
@@ -886,6 +886,26 @@ public function columnDataAndValueForTest(): array
                 ],
                 'expected' => 10
             ],
+            [
+                'actual' => [
+                    [
+                        'DATA_TYPE' => 'datetime /* mariadb-5.3 */',
+                        'DEFAULT' => 'CURRENT_TIMESTAMP'
+                    ],
+                    'null'
+                ],
+                'expected' => new \Zend_Db_Expr('NULL')
+            ],
+            [
+                'actual' => [
+                    [
+                        'DATA_TYPE' => 'date /* mariadb-5.3 */',
+                        'DEFAULT' => ''
+                    ],
+                    'null'
+                ],
+                'expected' => new \Zend_Db_Expr('NULL')
+            ],
             [
                 'actual' => [
                     [
@@ -910,6 +930,51 @@ public function columnDataAndValueForTest(): array
         ];
     }
 
+    /**
+     * @param string $actual
+     * @param string $expected
+     * @dataProvider providerForSanitizeColumnDataType
+     * @return void
+     * @throws \ReflectionException
+     */
+    public function testSanitizeColumnDataType(string $actual, string $expected)
+    {
+        $adapter = $this->getMysqlPdoAdapterMock([]);
+        $result = $this->invokeModelMethod($adapter, 'sanitizeColumnDataType', [$actual]);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * Data provider for testSanitizeColumnDataType
+     *
+     * @return array[]
+     */
+    public function providerForSanitizeColumnDataType()
+    {
+        return [
+            [
+                'actual' => 'int',
+                'expected' => 'int'
+            ],
+            [
+                'actual' => 'varchar',
+                'expected' => 'varchar'
+            ],
+            [
+                'actual' => 'datetime /* mariadb-5.3 */',
+                'expected' => 'datetime'
+            ],
+            [
+                'actual' => 'date /* mariadb-5.3 */',
+                'expected' => 'date'
+            ],
+            [
+                'actual' => 'timestamp /* mariadb-5.3 */',
+                'expected' => 'timestamp'
+            ]
+        ];
+    }
+
     /**
      * @param string $method
      * @param array $parameters