IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3831 from okaufmann/main

Browse Source 
Fixes `Unknown column 'notes' in 'where clause'` when using Rules
This commit is contained in:
James Cole 2020-09-23 03:49:50 +00:00 committed by GitHub
commit c686f16a93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Helpers/Collector/Extensions/MetaCollection.php
View File

@ -69,7 +69,7 @@ trait MetaCollection
public function notesContain(string $value): GroupCollectorInterface
{
$this->withNotes();
$this->query->where('notes', 'LIKE', sprintf('%%%s%%', $value));
$this->query->where('notes.text', 'LIKE', sprintf('%%%s%%', $value));
return $this;
}
@ -80,7 +80,7 @@ trait MetaCollection
public function notesEndWith(string $value): GroupCollectorInterface
{
$this->withNotes();
$this->query->where('notes', 'LIKE', sprintf('%%%s', $value));
$this->query->where('notes.text', 'LIKE', sprintf('%%%s', $value));
return $this;
}
@ -90,7 +90,7 @@ trait MetaCollection
public function withoutNotes(): GroupCollectorInterface
{
$this->withNotes();
$this->query->whereNull('notes');
$this->query->whereNull('notes.text');
return $this;
}
@ -101,7 +101,7 @@ trait MetaCollection
public function withAnyNotes(): GroupCollectorInterface
{
$this->withNotes();
$this->query->whereNotNull('notes');
$this->query->whereNotNull('notes.text');
return $this;
}
@ -112,7 +112,7 @@ trait MetaCollection
public function notesExactly(string $value): GroupCollectorInterface
{
$this->withNotes();
$this->query->where('notes', '=', sprintf('%s', $value));
$this->query->where('notes.text', '=', sprintf('%s', $value));
return $this;
}
@ -123,7 +123,7 @@ trait MetaCollection
public function notesStartWith(string $value): GroupCollectorInterface
{
$this->withNotes();
$this->query->where('notes', 'LIKE', sprintf('%s%%', $value));
$this->query->where('notes.text', 'LIKE', sprintf('%s%%', $value));
return $this;
}