From b8fe12a83622b350dc6849f8bb933bd8a86c1424 Mon Sep 17 00:00:00 2001 From: Noah Misch Date: Wed, 5 Aug 2015 20:44:27 -0400 Subject: Reconcile nodes/*funcs.c with recent work. A few of the discrepancies had semantic significance, but I did not track down the resulting user-visible bugs, if any. Back-patch to 9.5, where all but one discrepancy appeared. The _equalCreateEventTrigStmt() situation dates to 9.3 but does not affect semantics. catversion bump due to readfuncs.c field order changes. --- src/backend/nodes/copyfuncs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/backend/nodes/copyfuncs.c') diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 7248440ead3..1c8425d37d4 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -647,6 +647,7 @@ _copyCustomScan(const CustomScan *from) * copy remainder of node */ COPY_SCALAR_FIELD(flags); + COPY_NODE_FIELD(custom_plans); COPY_NODE_FIELD(custom_exprs); COPY_NODE_FIELD(custom_private); COPY_NODE_FIELD(custom_scan_tlist); @@ -1925,9 +1926,9 @@ _copyOnConflictExpr(const OnConflictExpr *from) COPY_SCALAR_FIELD(action); COPY_NODE_FIELD(arbiterElems); COPY_NODE_FIELD(arbiterWhere); + COPY_SCALAR_FIELD(constraint); COPY_NODE_FIELD(onConflictSet); COPY_NODE_FIELD(onConflictWhere); - COPY_SCALAR_FIELD(constraint); COPY_SCALAR_FIELD(exclRelIndex); COPY_NODE_FIELD(exclRelTlist); @@ -4082,7 +4083,7 @@ _copyCreatePolicyStmt(const CreatePolicyStmt *from) COPY_STRING_FIELD(policy_name); COPY_NODE_FIELD(table); - COPY_SCALAR_FIELD(cmd); + COPY_STRING_FIELD(cmd); COPY_NODE_FIELD(roles); COPY_NODE_FIELD(qual); COPY_NODE_FIELD(with_check); -- cgit v1.2.3