diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-04-30 08:52:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 08:52:50 +0200 |
| commit | 2df57b270c870e8b5fa63bc192e0cc4b4b42298c (patch) | |
| tree | b79fcc022501ceb532c2f8491dbef85fa80a6174 | |
| parent | 523a8ba5c39ee3663eef9dfa72c4518006266aa1 (diff) | |
| parent | f662d3663b819f6bfb1333385c2d2c080497960c (diff) | |
| download | nextcloud-server-2df57b270c870e8b5fa63bc192e0cc4b4b42298c.tar.gz nextcloud-server-2df57b270c870e8b5fa63bc192e0cc4b4b42298c.zip | |
Merge pull request #20720 from nextcloud/bugfix/noid/temporary-fix-contacts-search
Temporary fix contacts search
| -rw-r--r-- | apps/dav/lib/CardDAV/CardDavBackend.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index 6081ac31be3..a5d50762922 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -966,12 +966,14 @@ class CardDavBackend implements BackendInterface, SyncSupport { $query2->andWhere($query2->expr()->ilike('cp.value', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%'))); } } - if (isset($options['limit'])) { - $query2->setMaxResults($options['limit']); - } - if (isset($options['offset'])) { - $query2->setFirstResult($options['offset']); - } +// // FIXME Broken on MySQL: SQLSTATE[42000]: Syntax error or access violation: 1235 This version of MySQL doesn't yet support 'LIMIT & IN/ALL/ANY/SOME subquery' +// // FIXME Should use 2 queries instead +// if (isset($options['limit'])) { +// $query2->setMaxResults($options['limit']); +// } +// if (isset($options['offset'])) { +// $query2->setFirstResult($options['offset']); +// } $query->select('c.carddata', 'c.uri')->from($this->dbCardsTable, 'c') ->where($query->expr()->in('c.id', $query->createFunction($query2->getSQL()))); |