Optimize unsigned columns (#110)

Author: willvincent

src/Generators/MigrationGenerator.php

@@ -12,6 +12,20 @@ class MigrationGenerator implements Generator
 {
     const INDENT = '            ';
 
+    const NULLABLE_TYPES = [
+        'morphs',
+        'uuidMorphs',
+    ];
+
+    const UNSIGNABLE_TYPES = [
+      'bigInteger',
+      'decimal',
+      'integer',
+      'mediumInteger',
+      'smallInteger',
+      'tinyInteger',
+    ];
+
     /** @var \Illuminate\Contracts\Filesystem\Filesystem */
     private $files;
 
@@ -61,6 +75,14 @@ protected function buildDefinition(Model $model)
                 $dataType = 'unsignedBigInteger';
             }
 
+            if (in_array($dataType, self::UNSIGNABLE_TYPES) && in_array('unsigned', $column->modifiers())) {
+                $dataType = 'unsigned' . ucfirst($dataType);
+            }
+
+            if (in_array($dataType, self::NULLABLE_TYPES) && in_array('nullable', $column->modifiers())) {
+                $dataType = 'nullable' . ucfirst($dataType);
+            }
+
             if ($dataType === 'bigIncrements' && $this->isLaravel7orNewer()) {
                 $definition .= self::INDENT . '$table->id(';
             } else {
@@ -86,6 +108,10 @@ protected function buildDefinition(Model $model)
                     } else {
                         $definition .= '->' . key($modifier) . '(' . current($modifier) . ')';
                     }
+                } elseif ($modifier === 'unsigned' && Str::startsWith($dataType, 'unsigned')) {
+                    continue;
+                } elseif ($modifier === 'nullable' && Str::startsWith($dataType, 'nullable')) {
+                    continue;
                 } else {
                     $definition .= '->' . $modifier . '()';
                 }

tests/Feature/Generator/MigrationGeneratorTest.php

@@ -135,6 +135,7 @@ public function modelTreeDataProvider()
             ['definitions/with-timezones.bp', 'database/migrations/timestamp_create_comments_table.php', 'migrations/with-timezones.php'],
             ['definitions/relationships.bp', 'database/migrations/timestamp_create_comments_table.php', 'migrations/relationships.php'],
             ['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'],
         ];
     }

tests/fixtures/definitions/optimize.bp

@@ -0,0 +1,11 @@
+models:
+  Optimize:
+    tiny: tinyInteger unsigned
+    small: smallInteger unsigned
+    medium: mediumInteger unsigned
+    int: integer unsigned
+    dec: decimal:8,2 unsigned
+    big: bigInteger unsigned
+    foo: morphs nullable
+    foobar: uuidMorphs nullable
+    timestamps: false

tests/fixtures/migrations/optimize.php

@@ -1 +1,38 @@
 <?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOptimizesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('optimizes', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedTinyInteger('tiny');
+            $table->unsignedSmallInteger('small');
+            $table->unsignedMediumInteger('medium');
+            $table->unsignedInteger('int');
+            $table->unsignedDecimal('dec', 8, 2);
+            $table->unsignedBigInteger('big');
+            $table->nullableMorphs('foo');
+            $table->nullableUuidMorphs('foobar');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('optimizes');
+    }
+}