refactor(psql/mm): replace WHEN clause mods with fluent chain API#660
Merged
stephenafamo merged 1 commit intostephenafamo:mainfrom Apr 25, 2026
Merged
Conversation
Change WhenMatched/WhenNotMatched/WhenNotMatchedByTarget/WhenNotMatchedBySource
from functional options pattern to method chaining.
Before:
mm.WhenMatched(
mm.And(condition),
mm.ThenUpdate(mm.SetCol("x").ToExpr(e)),
)
After:
mm.WhenMatched().And(condition).ThenUpdate(
mm.SetCol("x").ToExpr(e),
)
Introduce WhenMatchedChain (for MATCHED / NOT MATCHED BY SOURCE)
and WhenNotMatchedChain (for NOT MATCHED [BY TARGET]) with
type-safe terminal methods: ThenUpdate, ThenDelete, ThenDoNothing,
ThenInsert, ThenInsertDefaultValues.
Remove standalone And, ThenDoNothing, ThenDelete, ThenUpdate,
ThenInsert, ThenInsertDefaultValues functions and WhenClause type.
Co-authored-by: Copilot <copilot@github.com>
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.
Sorry for the back-and-forth on this - after the initial merge implementation I went back and re-read the MERGE statement syntax more carefully:
It became clear that each
WHEN MATCHED / WHEN NOT MATCHEDclause is a self-contained, standalone expression — the condition (AND ...) and the action (THEN ...) are integral parts of that single clause, not independent modifiers applied to some external builder. The previous functional-options approach (WhenMatched(And(...), ThenUpdate(...))) obscured this structure by treating the condition and action as separate, unrelated mods passed into a bag.Switching to a fluent chain makes the code mirror the SQL grammar directly:
Changes
WhenMatched(),WhenNotMatched(),WhenNotMatchedByTarget(),WhenNotMatchedBySource()now take no arguments and return a chain typeWhenMatchedChain(forMATCHED/NOT MATCHED BY SOURCE) exposes.And(),.ThenUpdate(),.ThenDelete(),.ThenDoNothing()WhenNotMatchedChain(forNOT MATCHED [BY TARGET]) exposes.And(),.ThenInsert(),.ThenInsertDefaultValues(),.ThenDoNothing()And,ThenDoNothing,ThenDelete,ThenUpdate,ThenInsert,ThenInsertDefaultValuesfunctions and theWhenClausetype