Adds unique modifier and fixes attributes problem

Author: Mark Salmon

src/Lexers/ModelLexer.php

@@ -79,6 +79,7 @@ class ModelLexer implements Lexer
         'unsigned' => 'unsigned',
         'usecurrent' => 'useCurrent',
         'always' => 'always',
+        'unique' => 'unique',
     ];
 
     public function analyze(array $tokens): array
@@ -137,27 +138,27 @@ private function buildColumn(string $name, string $definition)
         foreach ($tokens as $token) {
             $parts = explode(':', $token);
             $value = $parts[0];
-            $attributes = $parts[1] ?? null;
 
             if ($value === 'id') {
                 $data_type = 'id';
             } elseif (isset(self::$dataTypes[strtolower($value)])) {
+                $attributes = $parts[1] ?? null;
                 $data_type = self::$dataTypes[strtolower($value)];
                 if (!empty($attributes)) {
                     $attributes = explode(',', $attributes);
                 }
             }
 
             if (isset(self::$modifiers[strtolower($value)])) {
-                if (empty($attributes)) {
+                $modifierAttributes = $parts[1] ?? null;
+                if (empty($modifierAttributes)) {
                     $modifiers[] = self::$modifiers[strtolower($value)];
                 } else {
-                    $modifiers[] = [self::$modifiers[strtolower($value)] => $attributes];
-                    $attributes = [];
+                    $modifiers[] = [self::$modifiers[strtolower($value)] => $modifierAttributes];
                 }
             }
         }
 
         return new Column($name, $data_type, $modifiers, $attributes ?? []);
     }
-}
+}

src/Translators/Rules.php

@@ -7,7 +7,7 @@
 
 class Rules
 {
-    public static function fromColumn(Column $column)
+    public static function fromColumn(Column $column, string $context = null)
     {
         // TODO: what about nullable?
         $rules = ['required'];
@@ -75,6 +75,10 @@ public static function fromColumn(Column $column)
             }
         }
 
+        if (in_array('unique', $column->modifiers()) && $context) {
+            $rules = array_merge($rules, ['unique:' . $context]);
+        }
+
         return $rules;
     }
 

tests/Feature/Lexers/ModelLexerTest.php

@@ -289,6 +289,28 @@ public function it_handles_modifier_attributes($definition, $modifier, $attribut
         $this->assertEquals([[$modifier => $attributes], 'nullable'], $columns['column']->modifiers());
     }
 
+    /**
+     * @test
+     */
+    public function it_handles_attributes_and_modifiers_with_attributes()
+    {
+        $tokens = [
+            'models' => [
+                'Model' => [
+                    'column' => 'string:100 unique charset:utf8'
+                ]
+            ],
+        ];
+
+        $actual = $this->subject->analyze($tokens)['models']['Model']->columns()['column'];
+
+        $this->assertEquals('column', $actual->name());
+        $this->assertEquals('string', $actual->dataType());
+        $this->assertEquals(['unique', ['charset' => 'utf8']], $actual->modifiers());
+        $this->assertEquals(['100'], $actual->attributes());
+    }
+
+
     /**
      * @test
      */
@@ -345,4 +367,4 @@ public function modifierAttributesProvider()
             ['collation:utf8_unicode', 'collation', 'utf8_unicode'],
         ];
     }
-}
+}

tests/Feature/Translators/RulesTest.php

@@ -132,6 +132,30 @@ public function forColumn_returns_date_rule_for_date_types($data_type)
         $this->assertContains('date', Rules::fromColumn($column));
     }
 
+    /**
+     * @test
+     * @dataProvider stringDataTypesProvider
+     */
+    public function forColumn_does_not_return_unique_rule_for_the_unique_modifier_without_context($data_type)
+    {
+        $column = new Column('test', $data_type, ['unique', 'nullable']);
+
+        $this->assertNotContains('unique:', Rules::fromColumn($column));
+    }
+
+    /**
+     * @test
+     */
+    public function forColumn_returns_unique_rule_for_the_unique_modifier()
+    {
+        $column = new Column('test', 'string', ['unique'], [100]);
+
+        $actual = Rules::fromColumn($column, 'connection.table');
+
+        $this->assertContains('unique:connection.table', $actual);
+        $this->assertContains('max:100', $actual);
+    }
+
     public function stringDataTypesProvider()
     {
         return [

tests/fixtures/definitions/model-modifiers.bp

@@ -1,9 +1,8 @@
 models:
   Modifier:
     title: string nullable
-    name: string:1000
+    name: string:1000 unique charset:'utf8'
     content: string default:''
     total: decimal:10,2
     ssn: char:11
     role: enum:user,admin,owner
-

tests/fixtures/migrations/modifiers.php

@@ -16,7 +16,7 @@ public function up()
         Schema::create('modifiers', function (Blueprint $table) {
             $table->increments('id');
             $table->string('title')->nullable();
-            $table->string('name', 1000);
+            $table->string('name', 1000)->unique()->charset('utf8');
             $table->string('content')->default('');
             $table->decimal('total', 10, 2);
             $table->char('ssn', 11);