Adopt PostgreSQL native conflict types for better compatibility #291
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
Replace Spock's custom SpockConflictType enum with PostgreSQL's ConflictType enum from replication/conflict.h. This provides more granular conflict classification and better alignment with PostgreSQL's built-in logical replication conflict handling. Key changes: - Rename conflict types to match PostgreSQL conventions: • update_update → update_exists (same-value conflicts) • update_update → update_origin_differs (different-origin conflicts) • update_delete → update_missing • delete_delete → delete_missing - Add migration for existing spock.resolutions.conflict_type data - Fix header guard typo (SPOCK_CONGLICT_H → SPOCK_CONFLICT_H) - Expand test coverage for all conflict scenarios including insert_exists, update_missing, and delete_missing cases The migration ensures existing conflict resolution data uses the new naming convention.
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.
Replace Spock's custom SpockConflictType enum with PostgreSQL's ConflictType enum from replication/conflict.h. This provides more granular conflict classification and better alignment with PostgreSQL's built-in logical replication conflict handling.
Key changes:
The migration ensures existing conflict resolution data uses the new naming convention.
Handling for differing origins for update and delete will be improved in a later PR.