mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-15 12:54:47 +02:00
Code Issues Releases Wiki Activity

Use *Raw methods instead of Expression

Browse Source
This commit is contained in:
Toby Zerner
2018-01-11 12:29:33 +10:30
parent d55945cefa
commit 14bc69d6bd
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/subscriptions/src/Gambit/SubscriptionGambit.php
View File

@@ -13,7 +13,6 @@ namespace Flarum\Subscriptions\Gambit;
use Flarum\Search\AbstractRegexGambit; use Flarum\Search\AbstractRegexGambit;
use Flarum\Search\AbstractSearch; use Flarum\Search\AbstractSearch;
use Illuminate\Database\Query\Expression;
class SubscriptionGambit extends AbstractRegexGambit class SubscriptionGambit extends AbstractRegexGambit
{ {
@@ -32,9 +31,9 @@ class SubscriptionGambit extends AbstractRegexGambit
// might be better as `id IN (subquery)`? // might be better as `id IN (subquery)`?
$method = $negate ? 'whereNotExists' : 'whereExists'; $method = $negate ? 'whereNotExists' : 'whereExists';
$search->getQuery()->$method(function ($query) use ($actor, $matches) { $search->getQuery()->$method(function ($query) use ($actor, $matches) {
$query->select(app('flarum.db')->raw(1)) $query->selectRaw('1')
->from('users_discussions') ->from('users_discussions')
->where('discussions.id', new Expression('discussion_id')) ->whereRaw('discussions.id = discussion_id')
->where('user_id', $actor->id) ->where('user_id', $actor->id)
->where('subscription', $matches[1] === 'follow' ? 'follow' : 'ignore'); ->where('subscription', $matches[1] === 'follow' ? 'follow' : 'ignore');
}); });

3
extensions/subscriptions/src/Listener/FilterDiscussionListBySubscription.php
View File

@@ -16,7 +16,6 @@ use Flarum\Event\ConfigureDiscussionGambits;
use Flarum\Event\ConfigureForumRoutes; use Flarum\Event\ConfigureForumRoutes;
use Flarum\Subscriptions\Gambit\SubscriptionGambit; use Flarum\Subscriptions\Gambit\SubscriptionGambit;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Database\Query\Expression;
class FilterDiscussionListBySubscription class FilterDiscussionListBySubscription
{ {
@@ -49,7 +48,7 @@ class FilterDiscussionListBySubscription
$event->search->getQuery()->whereNotExists(function ($query) use ($actor) { $event->search->getQuery()->whereNotExists(function ($query) use ($actor) {
$query->selectRaw(1) $query->selectRaw(1)
->from('users_discussions') ->from('users_discussions')
->where('discussions.id', new Expression('discussion_id')) ->whereRaw('discussions.id = discussion_id')
->where('user_id', $actor->id) ->where('user_id', $actor->id)
->where('subscription', 'ignore'); ->where('subscription', 'ignore');
}); });