From a48ea8cffa68540b704bead86456008d6978a91b Mon Sep 17 00:00:00 2001 From: Ole Ostergaard Date: Mon, 21 Jan 2019 17:54:16 +0100 Subject: Add insertIgnoreConflict to Adapter and use it for for executing the file locking. Signed-off-by: Ole Ostergaard --- lib/private/Lock/DBLockingProvider.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'lib/private/Lock') diff --git a/lib/private/Lock/DBLockingProvider.php b/lib/private/Lock/DBLockingProvider.php index 6d9c8f1b3d1..a1859047fe6 100644 --- a/lib/private/Lock/DBLockingProvider.php +++ b/lib/private/Lock/DBLockingProvider.php @@ -134,17 +134,7 @@ class DBLockingProvider extends AbstractLockingProvider { protected function initLockField(string $path, int $lock = 0): int { $expire = $this->getExpireTime(); - - try { - $builder = $this->connection->getQueryBuilder(); - return $builder->insert('file_locks') - ->setValue('key', $builder->createNamedParameter($path)) - ->setValue('lock', $builder->createNamedParameter($lock)) - ->setValue('ttl', $builder->createNamedParameter($expire)) - ->execute(); - } catch(UniqueConstraintViolationException $e) { - return 0; - } + return $this->connection->insertIgnoreConflict('file_locks', ['key' => $path, 'lock' => $lock, 'ttl' => $expire]); } /** -- cgit v1.2.3