kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-18 18:40:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix complex query. [skip ci]

Browse Source
This commit is contained in:
James Cole
2016-05-14 22:21:08 +02:00
parent b0bb790386
commit 29be16dcba
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Repositories/Account/AccountRepository.php
View File

@@ -13,7 +13,6 @@ use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Query\JoinClause; use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
@@ -326,22 +325,16 @@ class AccountRepository implements AccountRepositoryInterface
$accountIds = $accounts->pluck('id')->toArray(); $accountIds = $accounts->pluck('id')->toArray();
$query->leftJoin( $query->leftJoin(
'transactions as source', function (JoinClause $join) { 'transactions as source', function (JoinClause $join) {
$join->on('source.transaction_journal_id', '=', 'transaction_journals.id')->where('amount', '<', 0); $join->on('source.transaction_journal_id', '=', 'transaction_journals.id')->where('source.amount', '<', 0);
} }
); );
$query->leftJoin( $query->leftJoin(
'transactions as destination', function (JoinClause $join) { 'transactions as destination', function (JoinClause $join) {
$join->on('destination.transaction_journal_id', '=', 'transaction_journals.id')->where('amount', '>', 0); $join->on('destination.transaction_journal_id', '=', 'transaction_journals.id')->where('destination.amount', '>', 0);
} }
); );
$set = join(', ', $accountIds);
// XOR. must be either. $query->whereRaw('(source.account_id in (' . $set . ') XOR destination.account_id in (' . $set . '))');
$query->where(
function (Builder $query) use ($accountIds) {
$query->whereIn('source.account_id', $accountIds, 'xor')
->whereIn('destination.account_id', $accountIds, 'xor');
}
);
} }
// that should do it: // that should do it: