From f1464c53804fa7280a7942f6ac08038440f73b11 Mon Sep 17 00:00:00 2001 From: Simon Riggs Date: Fri, 6 Apr 2018 09:38:59 +0100 Subject: Improve parse representation for MERGE Separation of parser data structures from executor, as requested by Tom Lane. Further improvements possible. While there, implement error for multiple VALUES clauses via parser to allow line number of error, as requested by Andres Freund. Author: Pavan Deolasee Discussion: https://www.postgresql.org/message-id/CABOikdPpqjectFchg0FyTOpsGXyPoqwgC==OLKWuxgBOsrDDZw@mail.gmail.com --- src/test/regress/expected/merge.out | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/test') diff --git a/src/test/regress/expected/merge.out b/src/test/regress/expected/merge.out index 389eeedf289..03e30ef5599 100644 --- a/src/test/regress/expected/merge.out +++ b/src/test/regress/expected/merge.out @@ -90,7 +90,9 @@ USING source AS s ON t.tid = s.sid WHEN NOT MATCHED THEN INSERT VALUES (1,1), (2,2); -ERROR: Multiple VALUES clauses not allowed in MERGE INSERT statement +ERROR: syntax error at or near "," +LINE 5: INSERT VALUES (1,1), (2,2); + ^ ; -- SELECT query for INSERT MERGE INTO target t -- cgit v1.2.3