fix(carddav): Handle race for SAB creation better

* Accept non repeatable read and INSERT conflict by another read * Handle replication edge case Signed-off-by: Christoph Wurst <[email protected]>
nextcloud · Sep 18, 2024 · 9ba2828 · 9ba2828
1 parent 29a03ff
commit 9ba2828
Show file tree

Hide file tree

Showing 2 changed files with 302 additions and 281 deletions.
diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php
@@ -351,6 +351,7 @@ public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatc
 	 * @param array $properties
 	 * @return int
 	 * @throws BadRequest
+	 * @throws Exception
 	 */
 	public function createAddressBook($principalUri, $url, array $properties) {
 		if (strlen($url) > 255) {
@@ -395,7 +396,7 @@ public function createAddressBook($principalUri, $url, array $properties) {
 					'synctoken' => $query->createParameter('synctoken'),
 				])
 				->setParameters($values)
-				->execute();
+				->executeStatement();
 
 			$addressBookId = $query->getLastInsertId();
 			return [