Improve

yiisoft · May 5, 2024 · 02df181 · 02df181
1 parent 2f67fd4
commit 02df181
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 100 deletions.
diff --git a/src/ColumnSchema.php b/src/ColumnSchema.php
diff --git a/src/Schema.php b/src/Schema.php
@@ -223,7 +223,7 @@ protected function findColumns(TableSchemaInterface $table): bool
             }
 
             $column = $this->loadColumnSchema($info);
-            $table->column($column->getName(), $column);
+            $table->column($info['field'], $column);
 
             if ($column->isPrimaryKey()) {
                 $table->primaryKey($column->getName());
@@ -488,7 +488,6 @@ private function loadColumnSchema(array $info): ColumnSchemaInterface
         }
 
         $column->extra($extra);
-        $column->phpType($this->getColumnPhpType($type));
         $column->defaultValue($this->normalizeDefaultValue($info['default'], $column));
 
         if (str_starts_with($extra, 'DEFAULT_GENERATED')) {

diff --git a/tests/ColumnSchemaTest.php b/tests/ColumnSchemaTest.php
@@ -85,7 +85,7 @@ public function testPhpTypeCast(): void
         $jsonColPhpType = $tableSchema->getColumn('json_col')?->phpTypecast($query['json_col']);
 
         $this->assertSame(1, $intColPhpType);
-        $this->assertSame(1234567890, $bigUnsignedColPhpType);
+        $this->assertSame('1234567890', $bigUnsignedColPhpType);
         $this->assertSame(str_repeat('x', 100), $charColPhpType);
         $this->assertNull($charCol3PhpType);
         $this->assertSame(1.234, $floatColPhpType);

diff --git a/tests/Provider/SchemaProvider.php b/tests/Provider/SchemaProvider.php
@@ -45,7 +45,7 @@ public static function columns(): array
                     'bigunsigned_col' => [
                         'type' => 'bigint',
                         'dbType' => 'bigint(20) unsigned',
-                        'phpType' => 'integer',
+                        'phpType' => 'string',
                         'primaryKey' => false,
                         'allowNull' => true,
                         'autoIncrement' => false,