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

fix(dav): close cursor when fetching max id
nextcloud · Jul 12, 2023 · e9ac028 · e9ac028
2 parents 4882e5c + 9206c0f
commit e9ac028
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -3139,7 +3139,9 @@ public function pruneOutdatedSyncTokens(int $keep = 10_000): int {
 		$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;
 		}

diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php
@@ -1404,7 +1404,9 @@ public function pruneOutdatedSyncTokens(int $keep = 10_000): int {
 		$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;
 		}