Skip to content

fix(\OC\DB\Adapter): Ensure insertIfNotExist is atomic #54041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
provokateurin wants to merge 1 commit into from
Closed

fix(\OC\DB\Adapter): Ensure insertIfNotExist is atomic #54041

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/private/DB/Adapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,10 @@ public function insertIfNotExist($table, $input, ?array $compare = null) {
$query .= ' HAVING COUNT(*) = 0';

try {
return $this->conn->executeUpdate($query, $inserts);
$this->conn->beginTransaction();
$rows = $this->conn->executeUpdate($query, $inserts);
Copy link
Member

@ChristophWurst ChristophWurst Jul 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would the transaction stay open if this line throws? I think an explicit rollback is needed, at least for postgres

Copy link
Member

@blizzz blizzz Jul 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could alternatively use the atomic() helper from OCP\AppFramework\Db\TTransactional perhaps?

$this->conn->commit();
return $rows;
} catch (UniqueConstraintViolationException $e) {
// This exception indicates a concurrent insert happened between
// the insert and the sub-select in the insert, which is safe to ignore.
Expand Down
Loading