diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2022-03-16 13:13:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-16 13:13:06 +0100 |
| commit | 00e943640ac105cf4f76e51adc32e258930d410a (patch) | |
| tree | 8883a4402b078f05b54282bbda7334b87a237b69 | |
| parent | 85733a4b2e01147a9f1803b425820383b7cc8faf (diff) | |
| parent | 04ad3ba86396611c1fe53a66a41e72ed38dcda9a (diff) | |
| download | nextcloud-server-00e943640ac105cf4f76e51adc32e258930d410a.tar.gz nextcloud-server-00e943640ac105cf4f76e51adc32e258930d410a.zip | |
Merge pull request #31552 from nextcloud/backport/31274/stable22
[stable22] Fix more than 1000 entries in queries exception in CardDavBackend
| -rw-r--r-- | apps/dav/lib/CardDAV/CardDavBackend.php | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index 3e360fb2e41..1c1754ff752 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -139,7 +139,7 @@ class CardDavBackend implements BackendInterface, SyncSupport { ->from('addressbooks') ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri))); - $result = $query->execute(); + $result = $query->executeQuery(); $column = (int) $result->fetchOne(); $result->closeCursor(); return $column; @@ -1130,15 +1130,18 @@ class CardDavBackend implements BackendInterface, SyncSupport { return (int)$match['cardid']; }, $matches); + $cards = []; $query = $this->db->getQueryBuilder(); $query->select('c.addressbookid', 'c.carddata', 'c.uri') ->from($this->dbCardsTable, 'c') - ->where($query->expr()->in('c.id', $query->createNamedParameter($matches, IQueryBuilder::PARAM_INT_ARRAY))); - - $result = $query->execute(); - $cards = $result->fetchAll(); + ->where($query->expr()->in('c.id', $query->createParameter('matches'))); - $result->closeCursor(); + foreach (array_chunk($matches, 1000) as $matchesChunk) { + $query->setParameter('matches', $matchesChunk, IQueryBuilder::PARAM_INT_ARRAY); + $result = $query->executeQuery(); + $cards = array_merge($cards, $result->fetchAll()); + $result->closeCursor(); + } return array_map(function ($array) { $array['addressbookid'] = (int) $array['addressbookid']; |