mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6945 from nextcloud/12-6633 

[stable12] Don't add a LIKE condition when it's not needed
This commit is contained in:
Roeland Jago Douma 2017-10-25 08:53:37 +02:00 committed by GitHub
parent 5bd0bde89d 8c56f93124
commit 27e8352ef1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dav/lib/CardDAV/CardDavBackend.php
View File

@ -887,7 +887,11 @@ class CardDavBackend implements BackendInterface, SyncSupport {
$or->add($query2->expr()->eq('cp.name', $query->createNamedParameter($property)));
}
$query2->andWhere($or);
$query2->andWhere($query2->expr()->ilike('cp.value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')));
// No need for like when the pattern is empty
if ('' !== $pattern) {
$query2->andWhere($query2->expr()->ilike('cp.value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')));
}
$query->select('c.carddata', 'c.uri')->from($this->dbCardsTable, 'c')
->where($query->expr()->in('c.id', $query->createFunction($query2->getSQL())));