From b20d59028905b1dbee9a7a497fd03dc0dad6a122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= Date: Tue, 15 Jan 2019 21:03:12 +0100 Subject: [PATCH] revert the fix index names logic, preparing for illuminate 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, 4 insertions(+), 14 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 db3194c07..4dafee1e7 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,7 +9,6 @@ * file that was distributed with this source code. */ -use Flarum\Database\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Builder; @@ -31,20 +30,16 @@ return [ }) ->update(['user_id' => null]); - $schema->table('flags', function (Blueprint $table) use ($schema) { + $schema->table('flags', function (Blueprint $table) { $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) use ($schema) { + $schema->table('flags', function (Blueprint $table) { $table->dropForeign(['post_id']); $table->dropForeign(['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 9890b5e00..a6fbcdd47 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,24 +9,19 @@ * 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) use ($schema) { + $schema->table('flags', function (Blueprint $table) { $table->index('created_at'); - - Migration::fixIndexNames($schema, $table); }); }, 'down' => function (Builder $schema) { - $schema->table('flags', function (Blueprint $table) use ($schema) { + $schema->table('flags', function (Blueprint $table) { $table->dropIndex(['created_at']); - - Migration::fixIndexNames($schema, $table); }); } ];