diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2020-01-20 11:42:44 +0100 |
|---|---|---|
| committer |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2020-01-20 11:42:44 +0100 |
| commit | cd5ebcee05abf71e3e42da0abbb09a051385e60a (patch) | |
| tree | 6c6fd2277697ed831022baf6df04a70cf55f52d6 | |
| parent | f3ff4a59e64872ace3e285a762afd68c880fea5d (diff) | |
Fix SQLite CONCAT used for search (#2777)
Used e.g. for searches `inurl:xxx`
Co-authored-by: Marien Fressinaud <dev@marienfressinaud.fr>
| -rw-r--r-- | app/Models/EntryDAO.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index d149cfd8b..d2e7664fc 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -742,7 +742,7 @@ SQL; } if ($filter->getInurl()) { foreach ($filter->getInurl() as $url) { - $sub_search .= 'AND CONCAT(' . $alias . 'link, ' . $alias . 'guid) LIKE ? '; + $sub_search .= 'AND ' . $this->sqlConcat($alias . 'link', $alias . 'guid') . ' LIKE ? '; $values[] = "%{$url}%"; } } @@ -767,20 +767,20 @@ SQL; } if ($filter->getNotInurl()) { foreach ($filter->getNotInurl() as $url) { - $sub_search .= 'AND (NOT CONCAT(' . $alias . 'link, ' . $alias . 'guid) LIKE ?) '; + $sub_search .= 'AND (NOT ' . $this->sqlConcat($alias . 'link', $alias . 'guid') . ' LIKE ?) '; $values[] = "%{$url}%"; } } if ($filter->getSearch()) { foreach ($filter->getSearch() as $search_value) { - $sub_search .= 'AND ' . $this->sqlconcat($alias . 'title', $this->isCompressed() ? 'UNCOMPRESS(' . $alias . 'content_bin)' : '' . $alias . 'content') . ' LIKE ? '; + $sub_search .= 'AND ' . $this->sqlConcat($alias . 'title', $this->isCompressed() ? 'UNCOMPRESS(' . $alias . 'content_bin)' : '' . $alias . 'content') . ' LIKE ? '; $values[] = "%{$search_value}%"; } } if ($filter->getNotSearch()) { foreach ($filter->getNotSearch() as $search_value) { - $sub_search .= 'AND (NOT ' . $this->sqlconcat($alias . 'title', $this->isCompressed() ? 'UNCOMPRESS(' . $alias . 'content_bin)' : '' . $alias . 'content') . ' LIKE ?) '; + $sub_search .= 'AND (NOT ' . $this->sqlConcat($alias . 'title', $this->isCompressed() ? 'UNCOMPRESS(' . $alias . 'content_bin)' : '' . $alias . 'content') . ' LIKE ?) '; $values[] = "%{$search_value}%"; } } |