sqlite: allow passing conflict resolution handler function #56352
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
nodejs-github-bot
added
c++
louwers
force-pushed
the
sqlite-conflict-handler
branch
4 times, most recently
from
552a1e8 to
933ce21
Compare
louwers
force-pushed
the
sqlite-conflict-handler
branch
from
933ce21 to
3635cd9
Compare
louwers
changed the title
Renegade334
reviewed
Dec 24, 2024
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #56352 +/- ##
========================================
Coverage 88.54% 88.54%
========================================
Files 657 657
Lines 190395 190718 +323
Branches 36552 36601 +49
========================================
+ Hits 168586 168877 +291
- Misses 14992 15021 +29
- Partials 6817 6820 +3
|
louwers
force-pushed
the
sqlite-conflict-handler
branch
from
f63c3b4 to
a06a068
Compare
louwers
commented
Dec 24, 2024
|
@cjihrig Could you run CI? |
github-actions
bot
removed
the
request-ci
louwers
changed the title
|
Looks like a flaky test. Needs a re-run I think. |
cjihrig
approved these changes
Dec 28, 2024
jasnell
reviewed
Dec 28, 2024
jasnell
reviewed
Dec 28, 2024
jasnell
reviewed
Dec 28, 2024
jasnell
reviewed
Dec 28, 2024
jasnell
reviewed
Dec 28, 2024
Renegade334
reviewed
Dec 28, 2024
jasnell
approved these changes
Dec 28, 2024
|
@cjihrig Thanks for the review. Could you trigger another CI run? |
github-actions
bot
removed
the
request-ci
cjihrig
added
author ready
nodejs-github-bot
removed
the
commit-queue
|
Landed in 0dbbaba |
aduh95
pushed a commit
that referenced
this pull request
Jan 2, 2025
PR-URL: #56352 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]>
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.
Resolves #56210 by allowing to pass a conflict resolution handler that returns a conflict resolution type instead of just a conflict resolution type.
As @Renegade334 points out in that issue, it does not make sense to pass
SQLITE_CHANGESET_REPLACEbecause this conflict resolution type is only valid for certain conflict types. Therefore an API where the conflict-resolution handler receives the conflict type makes sense, so the user can return a valid conflict resolution type for a particular conflict type.An API where an individual (conflicting) change can be inspected (as is possible with the SQLite C conflict handler) would be a good follow-up. This would then be added as a second argument to the conflict handler.
Note that this is a breaking change, but since the SQLite module is experimental I don't think that is an issue.
Note: some of the documentation I added comes pretty much verbatim from the SQLite Documentation, but this is not an issue because the SQLite documentation is dedicated to the public domain. Also I linked to the SQLite documentation.