#11 - Fix skipping 'referencedTable' during migration construction

phalcon · Mar 22, 2020 · 4b3ed4e · 4b3ed4e
1 parent 632bfd3
commit 4b3ed4e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Migration/Action/Generate.php b/src/Migration/Action/Generate.php
@@ -311,13 +311,13 @@ public function getReferences(bool $skipRefSchema = false): Generator
                 );
             }
 
-            yield $constraintName => $referencesOptions + [
+            yield $constraintName => array_merge($referencesOptions, [
                 sprintf("'referencedTable' => %s", $this->wrapWithQuotes($reference->getReferencedTable())),
                 "'columns' => [" . join(',', array_unique($referenceColumns)) . "]",
                 "'referencedColumns' => [" . join(',', array_unique($referencedColumns)) . "]",
                 sprintf("'onUpdate' => '%s'", $reference->getOnUpdate()),
                 sprintf("'onDelete' => '%s'", $reference->getOnDelete()),
-            ];
+            ]);
         }
     }
 

diff --git a/tests/cli/GenerateCest.php b/tests/cli/GenerateCest.php
@@ -87,6 +87,7 @@ public function generateWithSkipRefSchema(CliTester $I): void
         $content = file_get_contents(codecept_output_dir('1.0.0/cli-skip-ref-schema.php'));
 
         $I->assertFalse(strpos($content, "'referencedSchema' => '$schema',"));
+        $I->assertNotFalse(strpos($content, "'referencedTable' => 'client',"));
     }
 
     /**
@@ -107,6 +108,7 @@ public function generateWithRefSchema(CliTester $I): void
         $content = file_get_contents(codecept_output_dir('1.0.0/cli-skip-ref-schema.php'));
 
         $I->assertNotFalse(strpos($content, "'referencedSchema' => '$schema',"));
+        $I->assertNotFalse(strpos($content, "'referencedTable' => 'client',"));
     }
 
     /**