Commitf026c16

committed

Fix MERGE's test for unreachable WHEN clauses.

The former code would only detect an unreachable WHEN clause if it hadan AND condition. Fix, so that unreachable unconditional WHEN clausesare also detected.Back-patch to v15, where MERGE was added.Discussion:https://postgr.es/m/CAEZATCVQ=7E2z4cSBB49jjeGGsB6WeoYQY32NDeSvcHiLUZ=ow@mail.gmail.com

1 parentd952373 commitf026c16Copy full SHA for f026c16

File tree

-5

lines changed

-5

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -155,12 +155,12 @@ transformMergeStmt(ParseState pstate, MergeStmt stmt)`
`155`	`155`	`/*`
`156`	`156`	`* Check for unreachable WHEN clauses`
`157`	`157`	`*/`
`158`		`-if (mergeWhenClause->condition==NULL)`
`159`		`-is_terminal[when_type]= true;`
`160`		`-elseif (is_terminal[when_type])`
	`158`	`+if (is_terminal[when_type])`
`161`	`159`	`ereport(ERROR,`
`162`	`160`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`163`	`161`	`errmsg("unreachable WHEN clause specified after unconditional WHEN clause")));`
	`162`	`+if (mergeWhenClause->condition==NULL)`
	`163`	`+is_terminal[when_type]= true;`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`/*`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,7 @@ USING source AS s`
`659`	`659`	`ON t.tid = s.sid`
`660`	`660`	`WHEN MATCHED THEN /* Terminal WHEN clause for MATCHED */`
`661`	`661`	`DELETE`
`662`		`-WHEN MATCHEDAND s.delta > 0THEN`
	`662`	`+WHEN MATCHED THEN`
`663`	`663`	`UPDATE SET balance = t.balance - s.delta;`
`664`	`664`	`ERROR: unreachable WHEN clause specified after unconditional WHEN clause`
`665`	`665`	`ROLLBACK;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ USING source AS s`
`438`	`438`	`ONt.tid=s.sid`
`439`	`439`	`WHEN MATCHED THEN/* Terminal WHEN clause for MATCHED*/`
`440`	`440`	`DELETE`
`441`		`-WHEN MATCHEDANDs.delta>0THEN`
	`441`	`+WHEN MATCHED THEN`
`442`	`442`	`UPDATESET balance=t.balance-s.delta;`
`443`	`443`	`ROLLBACK;`
`444`	`444`

Comments

(0)