fix(dav): Fix atomic addressbook update #43903
Merged
Conversation
This file contains 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
Sabre executes the proppatch callback *after* calling updateAddressbook and not synchronously. That means the code inside the callback was run outside a database transaction. This moves the atomic helper into the callback to create the expected transaction span. Signed-off-by: Christoph Wurst <[email protected]>
ChristophWurst
added
bug
3. to review
ChristophWurst
requested review from
miaulalala and
tcitworld
as code owners
6 tasks
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| $updates['description'] = $newValue; | ||
| break; | ||
| } | ||
| $propPatch->handle($supportedProperties, function ($mutations) use ($addressBookId) { |
Check notice
Code scanning / Psalm
MissingClosureParamType Note
| return true; | ||
| }); | ||
| }, $this->db); | ||
| $this->dispatcher->dispatchTyped(new AddressBookUpdatedEvent((int)$addressBookId, $addressBookRow, $shares, $mutations)); |
Check notice
Code scanning / Psalm
PossiblyNullArgument Note
4 tasks
skjnldsv
approved these changes
Mar 5, 2024
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.
Summary
Sabre executes the proppatch callback after calling updateAddressbook and not synchronously. That means the code inside the callback was run outside a database transaction. This moves the atomic helper into the callback to create the expected transaction span.
A fine detail we have missed in #36528.
We probably have to check the CalDAV backend too.#43904tl;dr: see https://github.com/nextcloud/server/pull/43903/files?w=1
Checklist