diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2023-02-02 06:54:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-02 06:54:28 +0100 |
| commit | fc4e87a2dfc5ff53bc9f15da13f355dd285769a9 (patch) | |
| tree | 7d74a1cee803c80121911dbc8d0fc0f6d8a7a250 | |
| parent | 129803d036a3d2346775400df0d950b037b4eb15 (diff) | |
| parent | 1a31ddb56d8b58440e23d4e38dbee18267de26ce (diff) | |
| download | nextcloud-server-fc4e87a2dfc5ff53bc9f15da13f355dd285769a9.tar.gz nextcloud-server-fc4e87a2dfc5ff53bc9f15da13f355dd285769a9.zip | |
Merge pull request #36487 from nextcloud/bugfix/noid/fix-query-builder-usage-in-dav-account-deletion
Do not reuse query builder objects in DAV account deletion
| -rw-r--r-- | apps/dav/lib/CalDAV/CalDavBackend.php | 4 | ||||
| -rw-r--r-- | apps/dav/lib/CardDAV/CardDavBackend.php | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index a894b65d756..909a5828059 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -897,7 +897,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription ->executeStatement(); $qbDeleteCalendarChanges = $this->db->getQueryBuilder(); - $qbDeleteCalendarObjects->delete('calendarchanges') + $qbDeleteCalendarChanges->delete('calendarchanges') ->where($qbDeleteCalendarChanges->expr()->eq('calendarid', $qbDeleteCalendarChanges->createNamedParameter($calendarId))) ->andWhere($qbDeleteCalendarChanges->expr()->eq('calendartype', $qbDeleteCalendarChanges->createNamedParameter(self::CALENDAR_TYPE_CALENDAR))) ->executeStatement(); @@ -905,7 +905,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription $this->calendarSharingBackend->deleteAllShares($calendarId); $qbDeleteCalendar = $this->db->getQueryBuilder(); - $qbDeleteCalendarObjects->delete('calendars') + $qbDeleteCalendar->delete('calendars') ->where($qbDeleteCalendar->expr()->eq('id', $qbDeleteCalendar->createNamedParameter($calendarId))) ->executeStatement(); diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index 03ddb93c084..ab21af1ce10 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -452,11 +452,13 @@ class CardDavBackend implements BackendInterface, SyncSupport { ->setParameter('addressbookid', $addressBookId, IQueryBuilder::PARAM_INT) ->executeStatement(); + $query = $this->db->getQueryBuilder(); $query->delete('addressbookchanges') ->where($query->expr()->eq('addressbookid', $query->createParameter('addressbookid'))) ->setParameter('addressbookid', $addressBookId, IQueryBuilder::PARAM_INT) ->executeStatement(); + $query = $this->db->getQueryBuilder(); $query->delete('addressbooks') ->where($query->expr()->eq('id', $query->createParameter('id'))) ->setParameter('id', $addressBookId, IQueryBuilder::PARAM_INT) @@ -464,6 +466,7 @@ class CardDavBackend implements BackendInterface, SyncSupport { $this->sharingBackend->deleteAllShares($addressBookId); + $query = $this->db->getQueryBuilder(); $query->delete($this->dbCardsPropertiesTable) ->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId, IQueryBuilder::PARAM_INT))) ->executeStatement(); |