summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorSimon Riggs <simon@2ndQuadrant.com>2018-04-06 09:38:59 +0100
committerSimon Riggs <simon@2ndQuadrant.com>2018-04-06 09:38:59 +0100
commitf1464c53804fa7280a7942f6ac08038440f73b11 (patch)
tree92667694010e18a435bd7d409b341d935a1ee90b /src/test
parent3b0b4f31f73a5f45f8e122d826211c13cd2412f7 (diff)
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
Diffstat (limited to 'src/test')
-rw-r--r--src/test/regress/expected/merge.out4
1 files changed, 3 insertions, 1 deletions
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