1
0
mirror of https://github.com/flarum/core.git synced 2025-07-17 14:51:19 +02:00

Database changes (#16)

* Add foreign keys

* Rename table

* Use whereColumn

* Update core attribute names
This commit is contained in:
Toby Zerner
2018-09-17 04:19:51 +09:30
committed by Franz Liedke
parent 7526b70cf5
commit 74fac8c206
5 changed files with 57 additions and 3 deletions

View File

@@ -13,7 +13,7 @@ export default class PostLikedNotification extends Notification {
content() {
const notification = this.props.notification;
const user = notification.sender();
const user = notification.fromUser();
const auc = notification.additionalUnreadCount();
return app.translator.transChoice('flarum-likes.forum.notifications.post_liked_text', auc + 1, {

View File

@@ -0,0 +1,14 @@
<?php
/*
* This file is part of Flarum.
*
* (c) Toby Zerner <toby.zerner@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
use Flarum\Database\Migration;
return Migration::renameTable('posts_likes', 'post_likes');

View File

@@ -0,0 +1,40 @@
<?php
/*
* This file is part of Flarum.
*
* (c) Toby Zerner <toby.zerner@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Schema\Builder;
return [
'up' => function (Builder $schema) {
// Delete rows with non-existent entities so that we will be able to create
// foreign keys without any issues.
$schema->getConnection()
->table('post_likes')
->whereNotExists(function ($query) {
$query->selectRaw(1)->from('posts')->whereColumn('id', 'post_id');
})
->orWhereNotExists(function ($query) {
$query->selectRaw(1)->from('users')->whereColumn('id', 'user_id');
})
->delete();
$schema->table('post_likes', function (Blueprint $table) {
$table->foreign('post_id')->references('id')->on('posts')->onDelete('cascade');
$table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
});
},
'down' => function (Builder $schema) {
$schema->table('post_likes', function (Blueprint $table) {
$table->dropForeign(['post_id', 'user_id']);
});
}
];

View File

@@ -42,7 +42,7 @@ class AddPostLikesRelationship
public function getModelRelationship(GetModelRelationship $event)
{
if ($event->isRelationship(Post::class, 'likes')) {
return $event->model->belongsToMany(User::class, 'posts_likes', 'post_id', 'user_id', null, null, 'likes');
return $event->model->belongsToMany(User::class, 'post_likes', 'post_id', 'user_id', null, null, 'likes');
}
}

View File

@@ -48,7 +48,7 @@ class PostLikedBlueprint implements BlueprintInterface
/**
* {@inheritdoc}
*/
public function getSender()
public function getFromUser()
{
return $this->user;
}