From 5a04635e7aa3be34ead71488e2693faf275ea6e7 Mon Sep 17 00:00:00 2001 From: Daniel Klabbers Date: Fri, 20 Jul 2018 08:41:01 +0200 Subject: [PATCH] decided to leave the posts.discussion_id foreign key constraint to discussions out for now --- .../2018_01_11_155200_change_discussions_b8_columns.php | 6 +++--- ...18_01_15_071800_change_discussions_users_b8_columns.php | 2 +- ..._18_130400_rename_permissions_to_groups_permissions.php | 2 +- migrations/2018_01_18_135000_change_posts_b8_columns.php | 7 +++---- ... => 2018_07_19_101301_constraints_group_permission.php} | 6 +++--- src/Discussion/Discussion.php | 2 +- src/Group/Group.php | 2 +- src/Group/Permission.php | 2 +- 8 files changed, 14 insertions(+), 15 deletions(-) rename migrations/{2018_07_19_101301_constraints_groups_permissions.php => 2018_07_19_101301_constraints_group_permission.php} (71%) diff --git a/migrations/2018_01_11_155200_change_discussions_b8_columns.php b/migrations/2018_01_11_155200_change_discussions_b8_columns.php index 5ef86a15d..fbd04da1d 100644 --- a/migrations/2018_01_11_155200_change_discussions_b8_columns.php +++ b/migrations/2018_01_11_155200_change_discussions_b8_columns.php @@ -26,9 +26,9 @@ return [ $table->renameColumn('hide_time', 'hidden_at'); $table->renameColumn('hide_user_id', 'hidden_user_id'); - $table->foreign('user_id')->references('id')->on('users'); - $table->foreign('last_posted_user_id')->references('id')->on('users'); - $table->foreign('hidden_user_id')->references('id')->on('users'); + $table->foreign('user_id')->references('id')->on('users')->onDelete('set null'); + $table->foreign('last_posted_user_id')->references('id')->on('users')->onDelete('set null'); + $table->foreign('hidden_user_id')->references('id')->on('users')->onDelete('set null'); $table->foreign('first_post_id')->references('id')->on('posts'); $table->foreign('last_post_id')->references('id')->on('posts'); }); diff --git a/migrations/2018_01_15_071800_change_discussions_users_b8_columns.php b/migrations/2018_01_15_071800_change_discussions_users_b8_columns.php index 1fc3ccd43..c48874a6c 100644 --- a/migrations/2018_01_15_071800_change_discussions_users_b8_columns.php +++ b/migrations/2018_01_15_071800_change_discussions_users_b8_columns.php @@ -18,7 +18,7 @@ return [ $table->renameColumn('read_time', 'last_read_at'); $table->renameColumn('read_number', 'last_read_post_number'); - $table->foreign('user_id')->references('id')->on('users'); + $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); $table->foreign('discussion_id')->references('id')->on('discussions')->onDelete('cascade'); }); }, diff --git a/migrations/2018_01_18_130400_rename_permissions_to_groups_permissions.php b/migrations/2018_01_18_130400_rename_permissions_to_groups_permissions.php index 8d8761878..c36d11e4e 100644 --- a/migrations/2018_01_18_130400_rename_permissions_to_groups_permissions.php +++ b/migrations/2018_01_18_130400_rename_permissions_to_groups_permissions.php @@ -11,4 +11,4 @@ use Flarum\Database\Migration; -return Migration::renameTable('permissions', 'groups_permissions'); +return Migration::renameTable('permissions', 'group_permission'); diff --git a/migrations/2018_01_18_135000_change_posts_b8_columns.php b/migrations/2018_01_18_135000_change_posts_b8_columns.php index 659699a71..2ac9c1af0 100644 --- a/migrations/2018_01_18_135000_change_posts_b8_columns.php +++ b/migrations/2018_01_18_135000_change_posts_b8_columns.php @@ -24,10 +24,9 @@ return [ $table->longText('content')->change(); - $table->foreign('discussion_id')->references('id')->on('discussions')->onDelete('cascade'); - $table->foreign('user_id')->references('id')->on('users'); - $table->foreign('edited_user_id')->references('id')->on('users'); - $table->foreign('hidden_user_id')->references('id')->on('users'); + $table->foreign('user_id')->references('id')->on('users')->onDelete('set null'); + $table->foreign('edited_user_id')->references('id')->on('users')->onDelete('set null'); + $table->foreign('hidden_user_id')->references('id')->on('users')->onDelete('set null'); }); }, diff --git a/migrations/2018_07_19_101301_constraints_groups_permissions.php b/migrations/2018_07_19_101301_constraints_group_permission.php similarity index 71% rename from migrations/2018_07_19_101301_constraints_groups_permissions.php rename to migrations/2018_07_19_101301_constraints_group_permission.php index 2e46377b6..4ed7a3a85 100644 --- a/migrations/2018_07_19_101301_constraints_groups_permissions.php +++ b/migrations/2018_07_19_101301_constraints_group_permission.php @@ -14,14 +14,14 @@ use Illuminate\Database\Schema\Builder; return [ 'up' => function (Builder $schema) { - $schema->table('groups_permissions', function (Blueprint $table) { + $schema->table('group_permission', function (Blueprint $table) { $table->foreign('group_id')->references('id')->on('groups')->onDelete('cascade'); }); }, 'down' => function (Builder $schema) { - $schema->table('group_user', function (Blueprint $table) { - $table->dropForeign('group_user_group_id_foreign'); + $schema->table('group_permission', function (Blueprint $table) { + $table->dropForeign('group_permission_group_id_foreign'); }); } ]; diff --git a/src/Discussion/Discussion.php b/src/Discussion/Discussion.php index e48825d09..1b1bfc194 100644 --- a/src/Discussion/Discussion.php +++ b/src/Discussion/Discussion.php @@ -400,7 +400,7 @@ class Discussion extends AbstractModel */ public function readers() { - return $this->belongsToMany(User::class, 'discussions_users'); + return $this->belongsToMany(User::class); } /** diff --git a/src/Group/Group.php b/src/Group/Group.php index 14daf1b69..0ce9741a2 100644 --- a/src/Group/Group.php +++ b/src/Group/Group.php @@ -121,7 +121,7 @@ class Group extends AbstractModel */ public function users() { - return $this->belongsToMany(User::class, 'users_groups'); + return $this->belongsToMany(User::class); } /** diff --git a/src/Group/Permission.php b/src/Group/Permission.php index ae50923d8..e5e4d872f 100644 --- a/src/Group/Permission.php +++ b/src/Group/Permission.php @@ -23,7 +23,7 @@ class Permission extends AbstractModel /** * {@inheritdoc} */ - protected $table = 'groups_permissions'; + protected $table = 'group_permission'; /** * Define the relationship with the group that this permission is for.