Fix Exception catching in OC\DB\Adapter

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
nextcloud · Sep 5, 2023 · 5c78adb · 5c78adb
1 parent e966cfb
commit 5c78adb
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/private/DB/Adapter.php b/lib/private/DB/Adapter.php
@@ -30,6 +30,7 @@
 
 use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
+use OC\DB\Exceptions\DbalException;
 
 /**
  * This handles the way we use to write queries, into something that can be
@@ -143,8 +144,11 @@ public function insertIgnoreConflict(string $table, array $values) : int {
 				$builder->setValue($key, $builder->createNamedParameter($value));
 			}
 			return $builder->executeStatement();
-		} catch (UniqueConstraintViolationException $e) {
-			return 0;
+		} catch (DbalException $e) {
+			if ($e->getReason() === \OCP\DB\Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+				return 0;
+			}
+			throw $e;
 		}
 	}
 }