Allow for foreign keys on pivot generation - resolves #274

Author: JeffreyWay

spec/Way/Generators/Parsers/MigrationFieldsParserSpec.php

@@ -15,32 +15,28 @@ function it_is_initializable()
     function it_parses_a_string_of_fields()
     {
         $this->parse('name:string')->shouldReturn([
-            'name' => ['type' => 'string']
+            ['field' => 'name', 'type' => 'string']
         ]);
 
         $this->parse('name:string, age:integer')->shouldReturn([
-            'name' => ['type' => 'string'],
-            'age'  => ['type' => 'integer']
-        ]);
-
-        $this->parse('name:string, age:integer')->shouldReturn([
-            'name' => ['type' => 'string'],
-            'age'  => ['type' => 'integer']
+            ['field' => 'name', 'type' => 'string'],
+            ['field' => 'age', 'type' => 'integer']
         ]);
 
         $this->parse('name:string:nullable, age:integer')->shouldReturn([
-            'name' => ['type' => 'string', 'decorators' => ['nullable']],
-            'age'  => ['type' => 'integer']
+            ['field' => 'name', 'type' => 'string', 'decorators' => ['nullable']],
+            ['field' => 'age', 'type' => 'integer']
         ]);
 
         $this->parse('name:string(15):nullable')->shouldReturn([
-            'name' => ['type' => 'string', 'args' => '15', 'decorators' => ['nullable']],
+            ['field' => 'name', 'type' => 'string', 'args' => '15', 'decorators' => ['nullable']]
         ]);
 
-        $this->parse('column:double(15,8):nullable:default(10), age:integer')->shouldReturn([
-            'column' => ['type' => 'double', 'args' => '15,8', 'decorators' => ['nullable', 'default(10)']],
-            'age'  => ['type' => 'integer']
+        $this->parse('name:double(15,8):nullable:default(10), age:integer')->shouldReturn([
+            ['field' => 'name', 'type' => 'double', 'args' => '15,8', 'decorators' => ['nullable', 'default(10)']],
+            ['field' => 'age', 'type' => 'integer']
         ]);
+
     }
 
 }

src/Way/Generators/Commands/PivotGeneratorCommand.php

@@ -58,7 +58,9 @@ public function getMigrationFields($tableOne, $tableTwo)
     {
         return implode(', ', [
             "{$tableOne}_id:integer:unsigned:index",
-            "{$tableTwo}_id:integer:unsigned:index"
+            "{$tableOne}_id:foreign:references('id'):on('" . str_plural($tableOne) . "'):onDelete('cascade')",
+            "{$tableTwo}_id:integer:unsigned:index",
+            "{$tableTwo}_id:foreign:references('id'):on('" . str_plural($tableTwo) . "'):onDelete('cascade')",
         ]);
     }
 

src/Way/Generators/Parsers/MigrationFieldsParser.php

@@ -16,9 +16,10 @@ public function parse($fields)
         // name:string, age:integer
         // name:string(10,2), age:integer
         $fields = preg_split('/\s?,\s/', $fields);
+
         $parsed = [];
 
-        foreach($fields as $field)
+        foreach($fields as $index => $field)
         {
             // Example:
             // name:string:nullable => ['name', 'string', 'nullable']
@@ -45,10 +46,10 @@ public function parse($fields)
             // be our decorators
             $decorators = $chunks;
 
-            $parsed[$property] = ['type' => $type];
+            $parsed[$index] = ['field' => $property, 'type' => $type];
 
-            if (isset($args)) $parsed[$property]['args'] = $args;
-            if ($decorators) $parsed[$property]['decorators'] = $decorators;
+            if (isset($args)) $parsed[$index]['args'] = $args;
+            if ($decorators) $parsed[$index]['decorators'] = $decorators;
         }
 
         return $parsed;

src/Way/Generators/Syntax/AddToTable.php

@@ -31,9 +31,9 @@ protected function addColumns($fields)
     {
         $schema = [];
 
-        foreach($fields as $property => $details)
+        foreach($fields as $field)
         {
-            $schema[] = $this->addColumn($property, $details);
+            $schema[] = $this->addColumn($field);
         }
 
         return $schema;
@@ -42,13 +42,13 @@ protected function addColumns($fields)
     /**
      * Return string for adding a column
      *
-     * @param $property
-     * @param $details
+     * @param $field
      * @return string
      */
-    private function addColumn($property, $details)
+    private function addColumn($field)
     {
-        $type = $details['type'];
+        $property = $field['field'];
+        $type = $field['type'];
 
         $output = sprintf(
             "\$table->%s(%s)",
@@ -58,19 +58,19 @@ private function addColumn($property, $details)
 
         // If we have args, then it needs
         // to be formatted a bit differently
-        if (isset($details['args']))
+        if (isset($field['args']))
         {
             $output = sprintf(
                 "\$table->%s('%s', %s)",
                 $type,
                 $property,
-                $details['args']
+                $field['args']
             );
         }
 
-        if (isset($details['decorators']))
+        if (isset($field['decorators']))
         {
-            $output .= $this->addDecorators($details['decorators']);
+            $output .= $this->addDecorators($field['decorators']);
         }
 
         return $output . ';';

src/Way/Generators/Syntax/CreateTable.php

@@ -16,11 +16,10 @@ public function create($migrationData, $fields)
 
         // All new tables should have an identifier
         // Let's add that for the user automatically
-        $primaryKey['id'] = ['type' => 'increments'];
-        $fields = $primaryKey + $fields;
+        array_unshift($fields, ['field' => 'id', 'type' => 'increments']);
 
         // We'll also add timestamps to new tables for convenience
-        $fields[''] = ['type' => 'timestamps'];
+        array_push($fields, ['field' => '', 'type' => 'timestamps']);
 
         return (new AddToTable($this->file, $this->compiler))->add($migrationData, $fields);
     }

src/Way/Generators/Syntax/RemoveFromTable.php

@@ -28,9 +28,9 @@ protected function dropColumns(array $fields)
     {
         $schema = [];
 
-        foreach($fields as $property => $type)
+        foreach($fields as $field)
         {
-            $schema[] = $this->dropColumn($property);
+            $schema[] = $this->dropColumn($field);
         }
 
         return $schema;
@@ -39,12 +39,13 @@ protected function dropColumns(array $fields)
     /**
      * Return string for dropping a column
      *
-     * @param $property
+     * @param $field
+     * @internal param $property
      * @return string
      */
-    private function dropColumn($property)
+    private function dropColumn($field)
     {
-        return sprintf("\$table->dropColumn('%s');", $property);
+        return sprintf("\$table->dropColumn('%s');", $field['field']);
     }
 
 }