Fix up blob columns.

Author: dereuromark

src/Db/Adapter/MysqlAdapter.php

@@ -469,29 +469,9 @@ protected function mapColumnType(array $columnData): array
         } elseif ($type === TableSchema::TYPE_TIMESTAMP_FRACTIONAL) {
             $type = 'timestamp';
             $length = $columnData['precision'] ?? $length;
-        } elseif ($type === TableSchema::TYPE_BINARY) {
-            // CakePHP returns BLOB columns as 'binary' with specific lengths
-            // Check the raw MySQL type to distinguish BLOB from BINARY columns
-            $rawType = $columnData['rawType'] ?? '';
-            if (str_contains($rawType, 'blob')) {
-                // Map BLOB columns back to the appropriate BLOB types
-                if (str_contains($rawType, 'tinyblob')) {
-                    $type = static::PHINX_TYPE_TINYBLOB;
-                    $length = static::BLOB_TINY;
-                } elseif (str_contains($rawType, 'mediumblob')) {
-                    $type = static::PHINX_TYPE_MEDIUMBLOB;
-                    $length = static::BLOB_MEDIUM;
-                } elseif (str_contains($rawType, 'longblob')) {
-                    $type = static::PHINX_TYPE_LONGBLOB;
-                    $length = static::BLOB_LONG;
-                } else {
-                    // Regular BLOB
-                    $type = static::PHINX_TYPE_BLOB;
-                    $length = static::BLOB_REGULAR;
-                }
-            }
-            // else: keep as binary or varbinary (actual BINARY/VARBINARY column)
         }
+        // Note: TYPE_BINARY columns (including BLOB variants) remain as 'binary' type
+        // with length parameter, aligned with CakePHP core's approach.
 
         return [$type, $length];
     }
@@ -504,16 +484,8 @@ public function getColumns(string $tableName): array
         $dialect = $this->getSchemaDialect();
         $columnRecords = $dialect->describeColumns($tableName);
 
-        // Fetch raw column types to distinguish BLOB from BINARY columns
-        $rawTypes = [];
-        $rows = $this->fetchAll(sprintf('SHOW COLUMNS FROM %s', $this->quoteTableName($tableName)));
-        foreach ($rows as $row) {
-            $rawTypes[$row['Field']] = strtolower($row['Type']);
-        }
-
         $columns = [];
         foreach ($columnRecords as $record) {
-            $record['rawType'] = $rawTypes[$record['name']] ?? null;
             [$type, $length] = $this->mapColumnType($record);
 
             $column = (new Column())

tests/TestCase/Db/Adapter/MysqlAdapterTest.php

@@ -1170,19 +1170,20 @@ public function testblobColumns(string $type, string $expectedType, ?int $limit,
     public static function blobRoundTripData()
     {
         return [
-            // type, limit, expected type after round-trip, expected limit after round-trip
-            ['blob', null, 'blob', MysqlAdapter::BLOB_REGULAR],
-            ['blob', MysqlAdapter::BLOB_REGULAR, 'blob', MysqlAdapter::BLOB_REGULAR],
-            ['tinyblob', null, 'tinyblob', MysqlAdapter::BLOB_TINY],
-            ['mediumblob', null, 'mediumblob', MysqlAdapter::BLOB_MEDIUM],
-            ['longblob', null, 'longblob', MysqlAdapter::BLOB_LONG],
+            // type, limit, expected type after round-trip (as 'binary'), expected limit after round-trip
+            // This aligns with CakePHP core which uses 'binary' type with length parameter
+            ['blob', null, 'binary', null],
+            ['blob', MysqlAdapter::BLOB_REGULAR, 'binary', null],
+            ['tinyblob', null, 'binary', TableSchema::LENGTH_TINY],
+            ['mediumblob', null, 'binary', TableSchema::LENGTH_MEDIUM],
+            ['longblob', null, 'binary', TableSchema::LENGTH_LONG],
         ];
     }
 
     #[DataProvider('blobRoundTripData')]
-    public function testBlobRoundTrip(string $type, ?int $limit, string $expectedType, int $expectedLimit)
+    public function testBlobRoundTrip(string $type, ?int $limit, string $expectedType, ?int $expectedLimit)
     {
-        // Create a table with a BLOB column
+        // Create a table with a BLOB column using Phinx-style type names
         $table = new Table('blob_round_trip_test', [], $this->adapter);
         $table->addColumn('blob_col', $type, ['limit' => $limit])
               ->save();
@@ -1200,12 +1201,17 @@ public function testBlobRoundTrip(string $type, ?int $limit, string $expectedTyp
         }
 
         $this->assertNotNull($blobColumn, 'BLOB column not found');
+
+        // After round-trip, blob columns are returned as 'binary' type with length (CakePHP style)
         $this->assertSame($expectedType, $blobColumn->getType(), 'Type mismatch after round-trip');
         $this->assertSame($expectedLimit, $blobColumn->getLimit(), 'Limit mismatch after round-trip');
 
-        // Verify that the SQL type is correct
-        $sqlType = $this->adapter->getSqlType($blobColumn->getType(), $blobColumn->getLimit());
-        $this->assertSame($type, $sqlType['name']);
+        // Verify that re-creating with the round-trip values produces an appropriate blob type
+        if ($expectedLimit !== null) {
+            $sqlType = $this->adapter->getSqlType($expectedType, $expectedLimit);
+            // For binary type with large limits, getSqlType delegates to blob logic
+            $this->assertContains($sqlType['name'], ['binary', 'tinyblob', 'blob', 'mediumblob', 'longblob']);
+        }
 
         // Clean up
         $this->adapter->dropTable('blob_round_trip_test');