Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

This commit is contained in:
James Cole 2020-09-23 05:50:51 +02:00
commit a7dc9e201f

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;
} }