fix: datatype of an id column (#109)

Author: Nathan Esayeas

src/Generators/MigrationGenerator.php

@@ -55,12 +55,10 @@ protected function buildDefinition(Model $model)
         /** @var \Blueprint\Models\Column $column */
         foreach ($model->columns() as $column) {
             $dataType = $column->dataType();
-            if ($column->name() === 'id' && $dataType !== 'uuid') {
+            if ($column->name() === 'id' && $dataType === 'id') {
                 $dataType = 'bigIncrements';
-            } elseif ($column->dataType() === 'id') {
+            } elseif ($dataType === 'id') {
                 $dataType = 'unsignedBigInteger';
-            } elseif ($column->dataType() === 'uuid') {
-                $dataType = 'uuid';
             }
 
             if ($dataType === 'bigIncrements' && $this->isLaravel7orNewer()) {

tests/Feature/Lexers/ModelLexerTest.php

@@ -45,13 +45,16 @@ public function it_returns_models()
                     'count' => 'integer',
                     'timestamps' => 'timestamps'
                 ],
+                'ModelThree' => [
+                    'id' => 'increments',
+                ],
             ],
         ];
 
         $actual = $this->subject->analyze($tokens);
 
         $this->assertIsArray($actual['models']);
-        $this->assertCount(2, $actual['models']);
+        $this->assertCount(3, $actual['models']);
 
         $model = $actual['models']['ModelOne'];
         $this->assertEquals('ModelOne', $model->name());
@@ -80,6 +83,17 @@ public function it_returns_models()
         $this->assertEquals('count', $columns['count']->name());
         $this->assertEquals('integer', $columns['count']->dataType());
         $this->assertEquals([], $columns['count']->modifiers());
+
+        $model = $actual['models']['ModelThree'];
+        $this->assertEquals('ModelThree', $model->name());
+        $this->assertTrue($model->usesTimestamps());
+        $this->assertFalse($model->usesSoftDeletes());
+
+        $columns = $model->columns();
+        $this->assertCount(1, $columns);
+        $this->assertEquals('id', $columns['id']->name());
+        $this->assertEquals('increments', $columns['id']->dataType());
+        $this->assertEquals([], $columns['id']->modifiers());
     }
 
     /**

tests/fixtures/definitions/model-modifiers.bp

@@ -1,5 +1,6 @@
 models:
   Modifier:
+    id: increments
     title: string nullable
     name: string:1000 unique charset:'utf8'
     content: string default:''

tests/fixtures/migrations/model-modifiers.php

@@ -14,7 +14,7 @@ class CreateModifiersTable extends Migration
     public function up()
     {
         Schema::create('modifiers', function (Blueprint $table) {
-            $table->id();
+            $table->increments('id');
             $table->string('title')->nullable();
             $table->string('name', 1000)->unique()->charset('utf8');
             $table->string('content')->default('');