github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-03 23:53:43 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Wrap column names; use whereColumn where possible

Browse Source
This commit is contained in:
Toby Zerner 2018-07-21 22:02:54 +09:30
parent 7474290138
commit 05c8e12761
13 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/migrations/2018_01_11_094000_change_access_tokens_add_foreign_keys.php
View File

@ -19,7 +19,7 @@ return [
$schema->getConnection()
->table('access_tokens')
->whereNotExists(function ($query) {
$query->selectRaw(1)->from('users')->whereRaw('id = user_id');
$query->selectRaw(1)->from('users')->whereColumn('id', 'user_id');
})
->delete();

2
framework/core/migrations/2018_01_11_155300_change_discussions_add_foreign_keys.php
View File

@ -21,7 +21,7 @@ return [
$selectId = function ($table, $column) use ($connection) {
return new Expression(
'('.$connection->table($table)->whereRaw("id = $column")->select('id')->toSql().')'
'('.$connection->table($table)->whereColumn('id', $column)->select('id')->toSql().')'
);
};

4
framework/core/migrations/2018_01_15_071900_change_discussion_user_add_foreign_keys.php
View File

@ -19,10 +19,10 @@ return [
$connection = $schema->getConnection();
$connection->table('discussion_user')
->whereNotExists(function ($query) {
$query->selectRaw(1)->from('users')->whereRaw('id = user_id');
$query->selectRaw(1)->from('users')->whereColumn('id', 'user_id');
})
->orWhereNotExists(function ($query) {
$query->selectRaw(1)->from('discussions')->whereRaw('id = discussion_id');
$query->selectRaw(1)->from('discussions')->whereColumn('id', 'discussion_id');
})
->delete();

2
framework/core/migrations/2018_01_15_072700_change_email_tokens_add_foreign_keys.php
View File

@ -19,7 +19,7 @@ return [
$schema->getConnection()
->table('email_tokens')
->whereNotExists(function ($query) {
$query->selectRaw(1)->from('users')->whereRaw('id = user_id');
$query->selectRaw(1)->from('users')->whereColumn('id', 'user_id');
})
->delete();

2
framework/core/migrations/2018_01_18_130500_change_group_permission_add_foreign_keys.php
View File

@ -19,7 +19,7 @@ return [
$schema->getConnection()
->table('group_permission')
->whereNotExists(function ($query) {
$query->selectRaw(1)->from('groups')->whereRaw('id = group_id');
$query->selectRaw(1)->from('groups')->whereColumn('id', 'group_id');
})
->delete();

4
framework/core/migrations/2018_01_18_130700_change_group_user_add_foreign_keys.php
View File

@ -19,10 +19,10 @@ return [
$schema->getConnection()
->table('group_user')
->whereNotExists(function ($query) {
$query->selectRaw(1)->from('users')->whereRaw('id = user_id');
$query->selectRaw(1)->from('users')->whereColumn('id', 'user_id');
})
->orWhereNotExists(function ($query) {
$query->selectRaw(1)->from('groups')->whereRaw('id = group_id');
$query->selectRaw(1)->from('groups')->whereColumn('id', 'group_id');
})
->delete();

4
framework/core/migrations/2018_01_18_133100_change_notifications_add_foreign_keys.php
View File

@ -19,14 +19,14 @@ return [
$schema->getConnection()
->table('notifications')
->whereNotExists(function ($query) {
$query->selectRaw(1)->from('users')->whereRaw('id = user_id');
$query->selectRaw(1)->from('users')->whereColumn('id', 'user_id');
})
->delete();
$schema->getConnection()
->table('notifications')
->whereNotExists(function ($query) {
$query->selectRaw(1)->from('users')->whereRaw('id = from_user_id');
$query->selectRaw(1)->from('users')->whereColumn('id', 'from_user_id');
})
->update(['from_user_id' => null]);

2
framework/core/migrations/2018_01_18_134500_change_password_tokens_add_foreign_keys.php
View File

@ -19,7 +19,7 @@ return [
$connection = $schema->getConnection();
$connection->table('password_tokens')
->whereNotExists(function ($query) {
$query->selectRaw(1)->from('users')->whereRaw('id = user_id');
$query->selectRaw(1)->from('users')->whereColumn('id', 'user_id');
})
->delete();

2
framework/core/migrations/2018_01_18_135100_change_posts_add_foreign_keys.php
View File

@ -21,7 +21,7 @@ return [
$selectId = function ($table, $column) use ($connection) {
return new Expression(
'('.$connection->table($table)->whereRaw("id = $column")->select('id')->toSql().')'
'('.$connection->table($table)->whereColumn('id', $column)->select('id')->toSql().')'
);
};

2
framework/core/src/Discussion/DiscussionRepository.php
View File

@ -51,7 +51,7 @@ class DiscussionRepository
{
return Discussion::leftJoin('discussions_users', 'discussions_users.discussion_id', '=', 'discussions.id')
->where('user_id', $user->id)
->whereRaw('last_read_post_number >= last_post_number')
->whereColumn('last_read_post_number', '>=', 'last_post_number')
->pluck('id')
->all();
}

19
framework/core/src/Discussion/Search/Gambit/FulltextGambit.php
View File

@ -33,22 +33,29 @@ class FulltextGambit implements GambitInterface
// See https://bugs.mysql.com/bug.php?id=74042
$bit = str_replace('@', '*', $bit);
$search->getQuery()
->selectRaw('SUBSTRING_INDEX(GROUP_CONCAT(posts.id ORDER BY MATCH(posts.content) AGAINST (?) DESC), \',\', 1) as most_relevant_post_id', [$bit])
$query = $search->getQuery();
$grammar = $query->getGrammar();
$query
->selectRaw('SUBSTRING_INDEX(GROUP_CONCAT('.$grammar->wrap('posts.id').' ORDER BY MATCH('.$grammar->wrap('posts.content').') AGAINST (?) DESC), \',\', 1) as most_relevant_post_id', [$bit])
->leftJoin('posts', 'posts.discussion_id', '=', 'discussions.id')
->where('posts.type', 'comment')
->where(function ($query) use ($search) {
event(new ScopeModelVisibility(Post::query()->setQuery($query), $search->getActor(), 'view'));
})
->where(function ($query) use ($bit) {
$query->whereRaw('MATCH(discussions.title) AGAINST (? IN BOOLEAN MODE)', [$bit])
->orWhereRaw('MATCH(posts.content) AGAINST (? IN BOOLEAN MODE)', [$bit]);
$grammar = $query->getGrammar();
$query->whereRaw('MATCH('.$grammar->wrap('discussions.title').') AGAINST (? IN BOOLEAN MODE)', [$bit])
->orWhereRaw('MATCH('.$grammar->wrap('posts.content').') AGAINST (? IN BOOLEAN MODE)', [$bit]);
})
->groupBy('posts.discussion_id');
$search->setDefaultSort(function ($query) use ($bit) {
$query->orderByRaw('MATCH(discussions.title) AGAINST (?) desc', [$bit]);
$query->orderByRaw('MATCH(posts.content) AGAINST (?) desc', [$bit]);
$grammar = $query->getGrammar();
$query->orderByRaw('MATCH('.$grammar->wrap('discussions.title').') AGAINST (?) desc', [$bit]);
$query->orderByRaw('MATCH('.$grammar->wrap('posts.content').') AGAINST (?) desc', [$bit]);
});
}
}

6
framework/core/src/Post/Post.php
View File

@ -121,13 +121,9 @@ class Post extends AbstractModel
// Make sure the post's discussion is visible as well
$query->whereExists(function ($query) use ($actor) {
$grammar = $query->getGrammar();
$column1 = $grammar->wrap('discussions.id');
$column2 = $grammar->wrap('posts.discussion_id');
$query->selectRaw('1')
->from('discussions')
->whereRaw("$column1 = $column2");
->whereColumn('discussions.id', 'posts.discussion_id');
static::$dispatcher->dispatch(
new ScopeModelVisibility(Discussion::query()->setQuery($query), $actor, 'view')

2
framework/core/src/Post/PostPolicy.php
View File

@ -86,7 +86,7 @@ class PostPolicy extends AbstractPolicy
->orWhereExists(function ($query) use ($actor) {
$query->selectRaw('1')
->from('discussions')
->whereRaw('discussions.id = posts.discussion_id')
->whereColumn('discussions.id', 'posts.discussion_id')
->where(function ($query) use ($actor) {
$this->events->dispatch(
new ScopeModelVisibility(Discussion::query()->setQuery($query), $actor, 'hidePosts')