upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 08:16:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Revert "[stable21] Fix constraint violation detection in QB Mapper"

Browse source
This commit is contained in:
Christoph Wurst 2021-06-30 14:38:11 +02:00 committed by GitHub
parent e76b83393c
commit affe97235d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/public/AppFramework/Db/QBMapper.php
View file

@ -30,7 +30,7 @@ declare(strict_types=1);
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 @@ abstract class QBMapper {
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);
}
}