create "bigint" column for "integer" in Migrator

atk4 · May 24, 2024 · 74e1b74 · 74e1b74
1 parent 1418be0
commit 74e1b74
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Schema/Migrator.php b/src/Schema/Migrator.php
@@ -240,18 +240,22 @@ public function field(string $fieldName, array $options = []): self
         $refType = $options['ref_type'] ?? self::REF_TYPE_NONE;
         unset($options['ref_type']);
 
+        if ($type === 'integer') {
+            $type = 'bigint';
+        }
+
         $column = $this->table->addColumn($this->getDatabasePlatform()->quoteSingleIdentifier($fieldName), $type);
 
         if (($options['nullable'] ?? true) && $refType !== self::REF_TYPE_PRIMARY) {
             $column->setNotnull(false);
         }
 
-        if ($type === 'integer' && $refType !== self::REF_TYPE_NONE) {
+        if ($type === 'bigint' && $refType !== self::REF_TYPE_NONE) {
             $column->setUnsigned(true);
         }
 
         // TODO remove, hack for createForeignKey so ID columns are unsigned
-        if ($type === 'integer' && str_ends_with($fieldName, '_id')) {
+        if ($type === 'bigint' && str_ends_with($fieldName, '_id')) {
             $column->setUnsigned(true);
         }
 

diff --git a/tests/Schema/MigratorTest.php b/tests/Schema/MigratorTest.php
@@ -339,6 +339,10 @@ public function testIntrospectTableToModelBasic(): void
             ];
         }
 
+        // "integer" DBAL type in Migrator is mapped to "bigint"
+        $expectedFields['id']['type'] = 'bigint';
+        $expectedFields['bar']['type'] = 'bigint';
+
         // TODO fix DBAL column comment type hint
         // see PlatformFixColumnCommentTypeHintTrait trait used for MSSQL and Oracle platforms
         if ($this->getDatabasePlatform() instanceof SQLitePlatform) {