Fix constraint violation detection in QB Mapper

Signed-off-by: Joas Schilling <coding@schilljs.com>

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