refactor: Migrate away from \OCP\IDBConnection::insertIfNotExist #57124
+96
−182
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
provokateurin
requested review from
Altahrim,
CarlSchwan,
icewind1991 and
leftybournes
and removed request for
a team
tcitworld
reviewed
Dec 17, 2025
Merged
icewind1991
reviewed
Jan 15, 2026
Merged
provokateurin
force-pushed
the
refactor/insert-if-not-exists
branch
from
d9b3fde to
d161459
Compare
Signed-off-by: provokateurin <kate@provokateurin.de>
Signed-off-by: provokateurin <kate@provokateurin.de>
Signed-off-by: provokateurin <kate@provokateurin.de>
provokateurin
force-pushed
the
refactor/insert-if-not-exists
branch
from
d161459 to
7eb9092
Compare
provokateurin
commented
Jan 20, 2026
Comment on lines
-42
to
+52
| $this->db->insertIfNotExist('*PREFIX*dav_shares', [ | ||
| 'principaluri' => 'principal:unknown', | ||
| 'type' => 'calendar', | ||
| 'access' => 2, | ||
| 'resourceid' => 666, | ||
| ]); | ||
| $this->db->insertIfNotExist('*PREFIX*dav_shares', [ | ||
| 'principaluri' => 'principals/remote-users/foobar', | ||
| 'type' => 'calendar', | ||
| 'access' => 2, | ||
| 'resourceid' => 666, | ||
| ]); | ||
| $qb = $this->db->getQueryBuilder(); | ||
| $qb->insert('dav_shares'); | ||
|
|
||
| foreach (['principal:unknown', 'principals/remote-users/foobar'] as $principaluri) { | ||
| $qb->values([ | ||
| 'principaluri' => $qb->createNamedParameter($principaluri), | ||
| 'type' => $qb->createNamedParameter('calendar'), | ||
| 'access' => $qb->createNamedParameter(2, IQueryBuilder::PARAM_INT), | ||
| 'resourceid' => $qb->createNamedParameter(666, IQueryBuilder::PARAM_INT), | ||
| ]); |
Member
Author
There was a problem hiding this comment.
The previous insertIfNotExists compared all input fields, while the unique index is create unique index dav_shares_index on oc_dav_shares (principaluri, resourceid, type, publicuri);. This seems to result in different numbers of rows, but only on sharding for some reason. I can't fully judge this, but I think the tests are incorrect in some way.
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A unique index must be used to actually guarantee no duplicates, as this method is not even transaction safe (with READ_COMMITTED)