feat(upsert): add onConflict option for custom conflict columns#5494
Closed
jbingen wants to merge 2 commits intorocicorp:mainfrom
Closed
feat(upsert): add onConflict option for custom conflict columns#5494jbingen wants to merge 2 commits intorocicorp:mainfrom
jbingen wants to merge 2 commits intorocicorp:mainfrom
Conversation
Allows specifying custom columns for ON CONFLICT in upsert operations,
instead of defaulting to primary key. This is useful when upserting
based on unique constraints other than the primary key.
Usage:
```typescript
await tx.mutate.table.upsert(
{ id: '123', workspace_id: 'ws1', email: 'user@example.com', role: 'member' },
{ onConflict: ['workspace_id', 'email'] }
)
```
This generates SQL like:
```sql
INSERT INTO table (...) VALUES (...)
ON CONFLICT (workspace_id, email) DO UPDATE SET ...
```
Changes:
- Add conflictColumns to UpsertOp in protocol schema
- Add UpsertOptions type with onConflict field
- Update server SQL generation to use custom conflict columns
- Pass options through client CRUD executor
|
@jbingen is attempting to deploy a commit to the Rocicorp Team on Vercel. A member of the Team first needs to authorize it. |
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
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
Allows specifying custom columns for
ON CONFLICTin upsert operations, instead of defaulting to the primary key. This is useful when upserting based on unique constraints other than the primary key.Motivation
When you have a table with a unique constraint on columns other than the primary key, the current
upsertalways usesON CONFLICT (primary_key). This PR adds anonConflictoption to specify which columns should be used for conflict detection.Example
This generates SQL like:
Changes
zero-protocol/push.ts: Add optionalconflictColumnsfield toUpsertOpschemazql/mutate/crud.ts: AddUpsertOptionstype withonConflictfield, updateTableCRUDandTableMutatortypeszero-server/custom.ts: Use custom conflict columns in SQL generation when providedzero-client/crud.ts: Pass options through the CRUD executor