Fix index names in migrations

This can be reverted when we upgrade to Laravel 5.7.
flarum · Nov 27, 2018 · f2d19bc · f2d19bc
1 parent c511c42
commit f2d19bc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/migrations/2018_06_27_102300_change_post_mentions_post_add_foreign_keys.php b/migrations/2018_06_27_102300_change_post_mentions_post_add_foreign_keys.php
@@ -9,6 +9,7 @@
  * file that was distributed with this source code.
  */
 
+use Flarum\Database\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Schema\Builder;
 
@@ -26,15 +27,19 @@
             })
             ->delete();
 
-        $schema->table('post_mentions_post', function (Blueprint $table) {
+        $schema->table('post_mentions_post', function (Blueprint $table) use ($schema) {
             $table->foreign('post_id')->references('id')->on('posts')->onDelete('cascade');
             $table->foreign('mentions_post_id')->references('id')->on('posts')->onDelete('cascade');
+
+            Migration::fixIndexNames($schema, $table);
         });
     },
 
     'down' => function (Builder $schema) {
-        $schema->table('posts_mentions_posts', function (Blueprint $table) {
+        $schema->table('posts_mentions_posts', function (Blueprint $table) use ($schema) {
             $table->dropForeign(['post_id', 'mentions_post_id']);
+
+            Migration::fixIndexNames($schema, $table);
         });
     }
 ];
diff --git a/migrations/2018_06_27_102500_change_post_mentions_user_add_foreign_keys.php b/migrations/2018_06_27_102500_change_post_mentions_user_add_foreign_keys.php
@@ -9,6 +9,7 @@
  * file that was distributed with this source code.
  */
 
+use Flarum\Database\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Schema\Builder;
 
@@ -26,15 +27,19 @@
             })
             ->delete();
 
-        $schema->table('post_mentions_user', function (Blueprint $table) {
+        $schema->table('post_mentions_user', function (Blueprint $table) use ($schema) {
             $table->foreign('post_id')->references('id')->on('posts')->onDelete('cascade');
             $table->foreign('mentions_user_id')->references('id')->on('users')->onDelete('cascade');
+
+            Migration::fixIndexNames($schema, $table);
         });
     },
 
     'down' => function (Builder $schema) {
-        $schema->table('post_mentions_user', function (Blueprint $table) {
+        $schema->table('post_mentions_user', function (Blueprint $table) use ($schema) {
             $table->dropForeign(['post_id', 'mentions_user_id']);
+
+            Migration::fixIndexNames($schema, $table);
         });
     }
 ];