kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 04:03:26 +00:00
Code Issues 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
parent 1624abd9ed f564ef5195
commit c686f16a93
1 changed files with 6 additions and 6 deletions
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 public function notesContain(string $value): GroupCollectorInterface
{ {
$this->withNotes(); $this->withNotes();
$this->query->where('notes', 'LIKE', sprintf('%%%s%%', $value)); $this->query->where('notes.text', 'LIKE', sprintf('%%%s%%', $value));
return $this; return $this;
} }
@@ -80,7 +80,7 @@ trait MetaCollection
public function notesEndWith(string $value): GroupCollectorInterface public function notesEndWith(string $value): GroupCollectorInterface
{ {
$this->withNotes(); $this->withNotes();
$this->query->where('notes', 'LIKE', sprintf('%%%s', $value)); $this->query->where('notes.text', 'LIKE', sprintf('%%%s', $value));
return $this; return $this;
} }
@@ -90,7 +90,7 @@ trait MetaCollection
public function withoutNotes(): GroupCollectorInterface public function withoutNotes(): GroupCollectorInterface
{ {
$this->withNotes(); $this->withNotes();
$this->query->whereNull('notes'); $this->query->whereNull('notes.text');
return $this; return $this;
} }
@@ -101,7 +101,7 @@ trait MetaCollection
public function withAnyNotes(): GroupCollectorInterface public function withAnyNotes(): GroupCollectorInterface
{ {
$this->withNotes(); $this->withNotes();
$this->query->whereNotNull('notes'); $this->query->whereNotNull('notes.text');
return $this; return $this;
} }
@@ -112,7 +112,7 @@ trait MetaCollection
public function notesExactly(string $value): GroupCollectorInterface public function notesExactly(string $value): GroupCollectorInterface
{ {
$this->withNotes(); $this->withNotes();
$this->query->where('notes', '=', sprintf('%s', $value)); $this->query->where('notes.text', '=', sprintf('%s', $value));
return $this; return $this;
} }
@@ -123,7 +123,7 @@ trait MetaCollection
public function notesStartWith(string $value): GroupCollectorInterface public function notesStartWith(string $value): GroupCollectorInterface
{ {
$this->withNotes(); $this->withNotes();
$this->query->where('notes', 'LIKE', sprintf('%s%%', $value)); $this->query->where('notes.text', 'LIKE', sprintf('%s%%', $value));
return $this; return $this;
} }