diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2018-04-06 09:38:59 +0100 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2018-04-06 09:38:59 +0100 |
| commit | f1464c53804fa7280a7942f6ac08038440f73b11 (patch) | |
| tree | 92667694010e18a435bd7d409b341d935a1ee90b /src/backend/nodes/outfuncs.c | |
| parent | 3b0b4f31f73a5f45f8e122d826211c13cd2412f7 (diff) | |
| download | postgresql-f1464c53804fa7280a7942f6ac08038440f73b11.tar.gz postgresql-f1464c53804fa7280a7942f6ac08038440f73b11.zip | |
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/backend/nodes/outfuncs.c')
| -rw-r--r-- | src/backend/nodes/outfuncs.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index c8d962670e2..a6a1c16164b 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -396,16 +396,17 @@ _outModifyTable(StringInfo str, const ModifyTable *node) } static void -_outMergeAction(StringInfo str, const MergeAction *node) +_outMergeWhenClause(StringInfo str, const MergeWhenClause *node) { - WRITE_NODE_TYPE("MERGEACTION"); + WRITE_NODE_TYPE("MERGEWHENCLAUSE"); WRITE_BOOL_FIELD(matched); WRITE_ENUM_FIELD(commandType, CmdType); WRITE_NODE_FIELD(condition); - WRITE_NODE_FIELD(qual); - WRITE_NODE_FIELD(stmt); WRITE_NODE_FIELD(targetList); + WRITE_NODE_FIELD(cols); + WRITE_NODE_FIELD(values); + WRITE_ENUM_FIELD(override, OverridingKind); } static void @@ -1724,6 +1725,17 @@ _outOnConflictExpr(StringInfo str, const OnConflictExpr *node) WRITE_NODE_FIELD(exclRelTlist); } +static void +_outMergeAction(StringInfo str, const MergeAction *node) +{ + WRITE_NODE_TYPE("MERGEACTION"); + + WRITE_BOOL_FIELD(matched); + WRITE_ENUM_FIELD(commandType, CmdType); + WRITE_NODE_FIELD(qual); + WRITE_NODE_FIELD(targetList); +} + /***************************************************************************** * * Stuff from relation.h. @@ -3679,8 +3691,8 @@ outNode(StringInfo str, const void *obj) case T_ModifyTable: _outModifyTable(str, obj); break; - case T_MergeAction: - _outMergeAction(str, obj); + case T_MergeWhenClause: + _outMergeWhenClause(str, obj); break; case T_Append: _outAppend(str, obj); @@ -3958,6 +3970,9 @@ outNode(StringInfo str, const void *obj) case T_OnConflictExpr: _outOnConflictExpr(str, obj); break; + case T_MergeAction: + _outMergeAction(str, obj); + break; case T_Path: _outPath(str, obj); break; |