Skip to content

[stable26] pruneOutdatedSyncTokens deletes all entries #38920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 3 commits into from
Jul 11, 2023
Merged

[stable26] pruneOutdatedSyncTokens deletes all entries #38920

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46ceb0d
Issue #36644: Fix pruneOutdatedSyncTokens for CalDAV
charno Jun 4, 2023
b0a2919
Issue #36644: Test cases
charno Jun 4, 2023
491eda9
fix(dav): close cursor when fetching max id
st3iny Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix(dav): close cursor when fetching max id 
Signed-off-by: Richard Steinmetz <[email protected]>
  • Loading branch information
@st3iny
st3iny committed Jul 11, 2023
commit 491eda93cc5d8b195ddc170db28beb11585761fd
4 changes: 3 additions & 1 deletion apps/dav/lib/CalDAV/CalDavBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3097,7 +3097,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;
}
Expand Down
4 changes: 3 additions & 1 deletion apps/dav/lib/CardDAV/CardDavBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,7 +1328,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;
}
Expand Down