From affe97235dba25204782783f96bc9d0ef1f4f4d1 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <ChristophWurst@users.noreply.github.com>
Date: Wed, 30 Jun 2021 14:38:11 +0200
Subject: [PATCH] Revert "[stable21] Fix constraint violation detection in QB
 Mapper"

---
 lib/public/AppFramework/Db/QBMapper.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/public/AppFramework/Db/QBMapper.php b/lib/public/AppFramework/Db/QBMapper.php
index 42b21f8f4b846..d9cd513e5e933 100644
--- a/lib/public/AppFramework/Db/QBMapper.php
+++ b/lib/public/AppFramework/Db/QBMapper.php
@@ -30,7 +30,7 @@
 
 namespace OCP\AppFramework\Db;
 
-use OCP\DB\Exception;
+use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
@@ -162,11 +162,8 @@ public function insert(Entity $entity): Entity {
 	public function insertOrUpdate(Entity $entity): Entity {
 		try {
 			return $this->insert($entity);
-		} catch (Exception $ex) {
-			if ($ex->getReason() === Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-				return $this->update($entity);
-			}
-			throw $ex;
+		} catch (UniqueConstraintViolationException $ex) {
+			return $this->update($entity);
 		}
 	}