Address a few TODOs

Author: markstory

src/Db/Adapter/MysqlAdapter.php

@@ -919,6 +919,25 @@ public function getColumnTypes(): array
         return $types;
     }
 
+    /**
+     * Get the default encoding for the current database.
+     *
+     * @return string The default encoding
+     */
+    public function getDefaultCollation(): string
+    {
+        $encodingRequest = 'SELECT DEFAULT_COLLATION_NAME
+            FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = :dbname';
+
+        $connection = $this->getConnection();
+        $connectionConfig = $connection->config();
+
+        $statement = $connection->execute($encodingRequest, ['dbname' => $connectionConfig['database']]);
+        $row = $statement->fetch('assoc');
+
+        return $row['DEFAULT_COLLATION_NAME'] ?? '';
+    }
+
     /**
      * Whether the server has a native uuid type.
      * (MariaDB 10.7.0+)

src/Db/Table.php

@@ -25,6 +25,7 @@
 use Migrations\Db\Action\RenameColumn;
 use Migrations\Db\Action\RenameTable;
 use Migrations\Db\Adapter\AdapterInterface;
+use Migrations\Db\Adapter\MysqlAdapter;
 use Migrations\Db\Plan\Intent;
 use Migrations\Db\Plan\Plan;
 use Migrations\Db\Table\Column;
@@ -637,19 +638,10 @@ public function create(): void
         }
 
         $adapter = $this->getAdapter();
-        if ($adapter->getAdapterType() === 'mysql' && empty($options['collation'])) {
-            // TODO this should be a method on the MySQL adapter.
-            // It could be a hook method on the adapter?
-            $encodingRequest = 'SELECT DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME
-                FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = :dbname';
-
-            $connection = $adapter->getConnection();
-            $connectionConfig = $connection->config();
-
-            $statement = $connection->execute($encodingRequest, ['dbname' => $connectionConfig['database']]);
-            $defaultEncoding = $statement->fetch('assoc');
-            if (!empty($defaultEncoding['DEFAULT_COLLATION_NAME'])) {
-                $options['collation'] = $defaultEncoding['DEFAULT_COLLATION_NAME'];
+        if ($adapter instanceof MysqlAdapter && empty($options['collation'])) {
+            $collation = $adapter->getDefaultCollation();
+            if ($collation) {
+                $options['collation'] = $collation;
             }
         }
 

src/Util/Util.php

@@ -114,8 +114,6 @@ public static function getVersionFromFileName(string $fileName): int
      */
     public static function mapClassNameToFileName(string $className): string
     {
-        // TODO it would be nice to replace this with Inflector::underscore
-        // but it will break compatibility for little end user gain.
         $snake = function ($matches) {
             return '_' . strtolower($matches[0]);
         };

src/View/Helper/MigrationHelper.php

@@ -408,12 +408,13 @@ public function getColumnOption(array $options): array
         }
 
         if (($isMysql || $isSqlserver) && !empty($columnOptions['collate'])) {
-            // TODO fix this when migrations is aligned with cakephp/database
+            // TODO deprecate this in 5.x
             // Change keys due to Phinx using different naming for the collation
             $columnOptions['collation'] = $columnOptions['collate'];
             unset($columnOptions['collate']);
         }
 
+        // TODO deprecate precision/scale and align with cakephp/database in 5.x
         // TODO this can be cleaned up when we stop using phinx data structures for column definitions
         if (!isset($columnOptions['precision']) || $columnOptions['precision'] == null) {
             unset($columnOptions['precision']);