upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-04 22:41:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Merge pull request #39297 from nextcloud/fix/dav/close-cursor

Browse source 
fix(dav): close cursor when fetching max id
This commit is contained in:
Joas Schilling 2023-07-12 20:35:54 +02:00 committed by GitHub
commit e9ac0287f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/dav/lib/CalDAV/CalDavBackend.php
View file

@ -3139,7 +3139,9 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$query->select($query->func()->max('id'))
->from('calendarchanges');
$maxId = $query->executeQuery()->fetchOne();
$result = $query->executeQuery();
$maxId = (int) $result->fetchOne();
$result->closeCursor();
if (!$maxId || $maxId < $keep) {
return 0;
}

4
apps/dav/lib/CardDAV/CardDavBackend.php
View file

@ -1404,7 +1404,9 @@ class CardDavBackend implements BackendInterface, SyncSupport {
$query->select($query->func()->max('id'))
->from('addressbookchanges');
$maxId = $query->executeQuery()->fetchOne();
$result = $query->executeQuery();
$maxId = (int) $result->fetchOne();
$result->closeCursor();
if (!$maxId || $maxId < $keep) {
return 0;
}