Fix index tokenizer to accept multiple columns / fks (#68)

Author: bennett-treptow

src/Tokenizers/MySQL/IndexTokenizer.php

@@ -56,15 +56,35 @@ private function consumeForeignKey()
         if (strtoupper($piece) === 'FOREIGN') {
             $this->consume(); //KEY
 
-            $columns = $this->columnsToArray($this->consume());
+            $columns = [];
+            $token = $this->consume();
+
+            while(!is_null($token)) {
+                $columns = array_merge($columns, $this->columnsToArray($token));
+                $token = $this->consume();
+                if(strtoupper($token) === 'REFERENCES') {
+                    $this->putBack($token);
+                    break;
+                }
+            }
             $this->definition->setIndexColumns($columns);
 
             $this->consume(); //REFERENCES
 
             $referencedTable = $this->parseColumn($this->consume());
             $this->definition->setForeignReferencedTable($referencedTable);
 
-            $referencedColumns = $this->columnsToArray($this->consume());
+            $referencedColumns = [];
+            $token = $this->consume();
+            while(!is_null($token)){
+                $referencedColumns = array_merge($referencedColumns, $this->columnsToArray($token));
+                $token = $this->consume();
+                if(strtoupper($token) === 'ON'){
+                    $this->putBack($token);
+                    break;
+                }
+            }
+
             $this->definition->setForeignReferencedColumns($referencedColumns);
 
             $this->consumeConstraintActions();

tests/Unit/Tokenizers/MySQL/IndexTokenizerTest.php

@@ -194,6 +194,19 @@ public function test_it_tokenizes_foreign_key_with_update_and_delete()
         $this->assertEquals('$table->foreign(\'user_id\', \'fk_bank_accounts_user_id\')->references(\'id\')->on(\'users\')->onUpdate(\'cascade\')->onDelete(\'cascade\')', $indexDefinition->render());
     }
 
+    public function test_it_tokenizes_foreign_key_with_multiple_columns(){
+        $indexTokenizer = IndexTokenizer::parse('CONSTRAINT `table2_ibfk_1` FOREIGN KEY (`table2-foreign1`, `table2-foreign2`) REFERENCES `table1` (`table1-field1`, `table1-field2`) ON DELETE CASCADE ON UPDATE CASCADE');
+        $definition = $indexTokenizer->definition();
+
+        $this->assertEquals('foreign', $definition->getIndexType());
+        $this->assertTrue($definition->isMultiColumnIndex());
+        $this->assertCount(2, $definition->getIndexColumns());
+        $this->assertEquals('table1', $definition->getForeignReferencedTable());
+        $this->assertSame(['table1-field1', 'table1-field2'], $definition->getForeignReferencedColumns());
+        $this->assertSame(['table2-foreign1', 'table2-foreign2'], $definition->getIndexColumns());
+        $this->assertEquals('$table->foreign([\'table2-foreign1\', \'table2-foreign2\'], \'table2_ibfk_1\')->references([\'table1-field1\', \'table1-field2\'])->on(\'table1\')->onDelete(\'cascade\')->onUpdate(\'cascade\')', $definition->render());
+    }
+
     public function test_it_tokenizes_foreign_key_with_update_restrict()
     {
         $indexTokenizer = IndexTokenizer::parse('CONSTRAINT `fk_bank_accounts_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON UPDATE NO ACTION');