From 2722a0f2c5117600c48a8cffd82ece70a155c6cd Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Tue, 27 Nov 2018 22:33:21 +1030
Subject: [PATCH] Fix index names in migrations
This can be reverted when we upgrade to Laravel 5.7.
---
.../2018_06_27_101600_change_flags_add_foreign_keys.php | 9 +++++++--
.../migrations/2018_09_15_043621_add_flags_indices.php | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/extensions/flags/migrations/2018_06_27_101600_change_flags_add_foreign_keys.php b/extensions/flags/migrations/2018_06_27_101600_change_flags_add_foreign_keys.php
index 92c14ab01..9dcdf3ede 100644
--- a/extensions/flags/migrations/2018_06_27_101600_change_flags_add_foreign_keys.php
+++ b/extensions/flags/migrations/2018_06_27_101600_change_flags_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;
@@ -30,15 +31,19 @@ return [
})
->update(['user_id' => null]);
- $schema->table('flags', function (Blueprint $table) {
+ $schema->table('flags', function (Blueprint $table) use ($schema) {
$table->foreign('post_id')->references('id')->on('posts')->onDelete('cascade');
$table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+
+ Migration::fixIndexNames($schema, $table);
});
},
'down' => function (Builder $schema) {
- $schema->table('flags', function (Blueprint $table) {
+ $schema->table('flags', function (Blueprint $table) use ($schema) {
$table->dropForeign(['post_id', 'user_id']);
+
+ Migration::fixIndexNames($schema, $table);
});
}
];
diff --git a/extensions/flags/migrations/2018_09_15_043621_add_flags_indices.php b/extensions/flags/migrations/2018_09_15_043621_add_flags_indices.php
index a6fbcdd47..9890b5e00 100644
--- a/extensions/flags/migrations/2018_09_15_043621_add_flags_indices.php
+++ b/extensions/flags/migrations/2018_09_15_043621_add_flags_indices.php
@@ -9,19 +9,24 @@
* file that was distributed with this source code.
*/
+use Flarum\Database\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Schema\Builder;
return [
'up' => function (Builder $schema) {
- $schema->table('flags', function (Blueprint $table) {
+ $schema->table('flags', function (Blueprint $table) use ($schema) {
$table->index('created_at');
+
+ Migration::fixIndexNames($schema, $table);
});
},
'down' => function (Builder $schema) {
- $schema->table('flags', function (Blueprint $table) {
+ $schema->table('flags', function (Blueprint $table) use ($schema) {
$table->dropIndex(['created_at']);
+
+ Migration::fixIndexNames($schema, $table);
});
}
];