Refactor disabling id within lexer

Author: jasonmccreary

src/Generators/MigrationGenerator.php

@@ -69,7 +69,8 @@ protected function buildDefinition(Model $model)
         /** @var \Blueprint\Models\Column $column */
         foreach ($model->columns() as $column) {
             $dataType = $column->dataType();
-            if ($column->name() === 'id' && $dataType === 'id' && $model->usesPrimaryKey()) {
+
+            if ($column->name() === 'id' && $dataType === 'id') {
                 $dataType = 'bigIncrements';
             } elseif ($dataType === 'id') {
                 $dataType = 'unsignedBigInteger';

src/Lexers/ModelLexer.php

@@ -120,6 +120,7 @@ private function buildModel(string $name, array $columns)
         if (isset($columns['id'])) {
             if ($columns['id'] === false) {
                 $model->disablePrimaryKey();
+                unset($columns['id']);
             }
         }
 
@@ -154,7 +155,7 @@ private function buildModel(string $name, array $columns)
             unset($columns['relationships']);
         }
 
-        if (!isset($columns['id'])) {
+        if (!isset($columns['id']) && $model->usesPrimaryKey()) {
             $column = $this->buildColumn('id', 'id');
             $model->addColumn($column);
         }

tests/Feature/BlueprintTest.php

@@ -95,29 +95,6 @@ public function it_parses_shorthands()
         ], $this->subject->parse($blueprint));
     }
 
-    /**
-     * @test
-     */
-    public function it_parses_shorthands_that_disables_id()
-    {
-        $blueprint = $this->fixture('definitions/without-id.bp');
-
-        $this->assertEquals([
-            'models' => [
-                'Name' => [
-                    'softdeletes' => 'softDeletes',
-                    'id' => false,
-                    'timestamps' => 'timestamps',
-                ],
-            ],
-            'controllers' => [
-                'Context' => [
-                    'resource' => 'all'
-                ]
-            ]
-        ], $this->subject->parse($blueprint));
-    }
-
     /**
      * @test
      */

tests/Feature/Generator/MigrationGeneratorTest.php

@@ -137,6 +137,7 @@ public function modelTreeDataProvider()
             ['definitions/unconventional.bp', 'database/migrations/timestamp_create_teams_table.php', 'migrations/unconventional.php'],
             ['definitions/optimize.bp', 'database/migrations/timestamp_create_optimizes_table.php', 'migrations/optimize.php'],
             ['definitions/model-key-constraints.bp', 'database/migrations/timestamp_create_orders_table.php', 'migrations/model-key-constraints.php'],
+            ['definitions/disable-auto-columns.bp', 'database/migrations/timestamp_create_states_table.php', 'migrations/disable-auto-columns.php'],
         ];
     }
 }

tests/Feature/Lexers/ModelLexerTest.php

@@ -134,7 +134,7 @@ public function it_defaults_the_id_column()
     /**
      * @test
      */
-    public function it_disables_primary_keys()
+    public function it_disables_the_id_column()
     {
         $tokens = [
             'models' => [
@@ -152,6 +152,7 @@ public function it_disables_primary_keys()
         $model = $actual['models']['Model'];
 
         $this->assertEquals('Model', $model->name());
+        $this->assertCount(0, $model->columns());
         $this->assertFalse($model->usesPrimaryKey());
     }
 

tests/fixtures/definitions/disable-auto-columns.bp

@@ -1,5 +1,7 @@
 models:
   State:
+    id: false
     name: string
     code: string
+    country_id: biginteger unsigned
     timestamps: false

tests/fixtures/definitions/without-id.bp

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateStatesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('states', function (Blueprint $table) {
+            $table->string('name');
+            $table->string('code');
+            $table->unsignedBigInteger('country_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('states');
+    }
+}

tests/fixtures/migrations/disable-auto-columns.php

@@ -5,9 +5,9 @@
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @property int $id
  * @property string $name
  * @property string $code
+ * @property int $country_id
  */
 class State extends Model
 {
@@ -19,6 +19,7 @@ class State extends Model
     protected $fillable = [
         'name',
         'code',
+        'country_id',
     ];
 
     /**
@@ -27,6 +28,6 @@ class State extends Model
      * @var array
      */
     protected $casts = [
-        'id' => 'integer',
+        'country_id' => 'integer',
     ];
 }