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

Author: nickvergessen

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -897,15 +897,15 @@ public function deleteCalendar($calendarId, bool $forceDeletePermanently = false
 				->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();
 
 			$this->calendarSharingBackend->deleteAllShares($calendarId);
 
 			$qbDeleteCalendar = $this->db->getQueryBuilder();
-			$qbDeleteCalendarObjects->delete('calendars')
+			$qbDeleteCalendar->delete('calendars')
 				->where($qbDeleteCalendar->expr()->eq('id', $qbDeleteCalendar->createNamedParameter($calendarId)))
 				->executeStatement();
 

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -452,18 +452,21 @@ public function deleteAddressBook($addressBookId) {
 			->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)
 			->executeStatement();
 
 		$this->sharingBackend->deleteAllShares($addressBookId);
 
+		$query = $this->db->getQueryBuilder();
 		$query->delete($this->dbCardsPropertiesTable)
 			->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId, IQueryBuilder::PARAM_INT)))
 			->executeStatement();