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/backend/nodes/nodeFuncs.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/backend/nodes/nodeFuncs.c') diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c index 4157e7eb9a3..f2f8227eb2a 100644 --- a/src/backend/nodes/nodeFuncs.c +++ b/src/backend/nodes/nodeFuncs.c @@ -3444,19 +3444,23 @@ raw_expression_tree_walker(Node *node, return true; if (walker(stmt->join_condition, context)) return true; - if (walker(stmt->mergeActionList, context)) + if (walker(stmt->mergeWhenClauses, context)) return true; if (walker(stmt->withClause, context)) return true; } break; - case T_MergeAction: + case T_MergeWhenClause: { - MergeAction *action = (MergeAction *) node; + MergeWhenClause *mergeWhenClause = (MergeWhenClause *) node; - if (walker(action->targetList, context)) + if (walker(mergeWhenClause->condition, context)) return true; - if (walker(action->qual, context)) + if (walker(mergeWhenClause->targetList, context)) + return true; + if (walker(mergeWhenClause->cols, context)) + return true; + if (walker(mergeWhenClause->values, context)) return true; } break; -- cgit v1.2.3