Migrations: Fix dropping foreign keys

Passing an array to dropForeign does not mean dropping multiple indices, but rather dropping a key on multiple tables. Passing a string means that this string will be interpreted as index name, not as name of the indexed column. Passing an array with one string is therefore correct, in order to benefit from automatic index name generation.
flarum · Nov 30, 2018 · 57d5846 · 57d5846
1 parent fb6b51b
commit 57d5846
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/migrations/2018_01_11_155300_change_discussions_add_foreign_keys.php b/migrations/2018_01_11_155300_change_discussions_add_foreign_keys.php
@@ -47,10 +47,11 @@
 
     'down' => function (Builder $schema) {
         $schema->table('discussions', function (Blueprint $table) use ($schema) {
-            $table->dropForeign([
-                'user_id', 'last_posted_user_id', 'hidden_user_id',
-                'first_post_id', 'last_post_id'
-            ]);
+            $table->dropForeign(['user_id']);
+            $table->dropForeign(['last_posted_user_id']);
+            $table->dropForeign(['hidden_user_id']);
+            $table->dropForeign(['first_post_id']);
+            $table->dropForeign(['last_post_id']);
 
             Migration::fixIndexNames($schema, $table);
         });

diff --git a/migrations/2018_01_15_071900_change_discussion_user_add_foreign_keys.php b/migrations/2018_01_15_071900_change_discussion_user_add_foreign_keys.php
@@ -37,7 +37,8 @@
 
     'down' => function (Builder $schema) {
         $schema->table('discussion_user', function (Blueprint $table) use ($schema) {
-            $table->dropForeign(['user_id', 'discussion_id']);
+            $table->dropForeign(['user_id']);
+            $table->dropForeign(['discussion_id']);
 
             Migration::fixIndexNames($schema, $table);
         });

diff --git a/migrations/2018_01_18_130700_change_group_user_add_foreign_keys.php b/migrations/2018_01_18_130700_change_group_user_add_foreign_keys.php
@@ -37,7 +37,8 @@
 
     'down' => function (Builder $schema) {
         $schema->table('group_user', function (Blueprint $table) use ($schema) {
-            $table->dropForeign(['user_id', 'group_id']);
+            $table->dropForeign(['user_id']);
+            $table->dropForeign(['group_id']);
 
             Migration::fixIndexNames($schema, $table);
         });

diff --git a/migrations/2018_01_18_133100_change_notifications_add_foreign_keys.php b/migrations/2018_01_18_133100_change_notifications_add_foreign_keys.php
@@ -41,7 +41,8 @@
 
     'down' => function (Builder $schema) {
         $schema->table('notifications', function (Blueprint $table) use ($schema) {
-            $table->dropForeign(['user_id', 'from_user_id']);
+            $table->dropForeign(['user_id']);
+            $table->dropForeign(['from_user_id']);
 
             Migration::fixIndexNames($schema, $table);
         });

diff --git a/migrations/2018_01_18_135100_change_posts_add_foreign_keys.php b/migrations/2018_01_18_135100_change_posts_add_foreign_keys.php
@@ -43,10 +43,10 @@
 
     'down' => function (Builder $schema) {
         $schema->table('posts', function (Blueprint $table) use ($schema) {
-            $table->dropForeign([
-                'user_id', 'discussion_id',
-                'edited_user_id', 'hidden_user_id'
-            ]);
+            $table->dropForeign(['user_id']);
+            $table->dropForeign(['discussion_id']);
+            $table->dropForeign(['edited_user_id']);
+            $table->dropForeign(['hidden_user_id']);
 
             Migration::fixIndexNames($schema, $table);
         });