postgres
diff --git a/‎src/backend/parser/parse_merge.c
Copy file name to clipboardExpand all lines: src/backend/parser/parse_merge.c
+3-3Lines changed: 3 additions & 3 deletions b/‎src/backend/parser/parse_merge.c
Copy file name to clipboardExpand all lines: src/backend/parser/parse_merge.c
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/test/regress/expected/merge.out
Copy file name to clipboardExpand all lines: src/test/regress/expected/merge.out
+1-1Lines changed: 1 addition & 1 deletion b/‎src/test/regress/expected/merge.out
Copy file name to clipboardExpand all lines: src/test/regress/expected/merge.out
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/test/regress/sql/merge.sql
Copy file name to clipboardExpand all lines: src/test/regress/sql/merge.sql
+1-1Lines changed: 1 addition & 1 deletion b/‎src/test/regress/sql/merge.sql
Copy file name to clipboardExpand all lines: src/test/regress/sql/merge.sql
+1-1Lines changed: 1 addition & 1 deletion
@@ -155,12 +155,12 @@ transformMergeStmt(ParseState *pstate, MergeStmt *stmt)
 		/*
 		 * Check for unreachable WHEN clauses
 		 */
-		if (mergeWhenClause->condition == NULL)
-			is_terminal[when_type] = true;
-		else if (is_terminal[when_type])
+		if (is_terminal[when_type])
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
 					 errmsg("unreachable WHEN clause specified after unconditional WHEN clause")));
+		if (mergeWhenClause->condition == NULL)
+			is_terminal[when_type] = true;
 	}
 
 	/*
 
@@ -659,7 +659,7 @@ USING source AS s
 ON t.tid = s.sid
 WHEN MATCHED THEN /* Terminal WHEN clause for MATCHED */
 	DELETE
-WHEN MATCHED AND s.delta > 0 THEN
+WHEN MATCHED THEN
 	UPDATE SET balance = t.balance - s.delta;
 ERROR:  unreachable WHEN clause specified after unconditional WHEN clause
 ROLLBACK;
 
@@ -438,7 +438,7 @@ USING source AS s
 ON t.tid = s.sid
 WHEN MATCHED THEN /* Terminal WHEN clause for MATCHED */
 	DELETE
-WHEN MATCHED AND s.delta > 0 THEN
+WHEN MATCHED THEN
 	UPDATE SET balance = t.balance - s.delta;
 ROLLBACK;