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/readfuncs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/backend/nodes/readfuncs.c') diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c index 71be840eac9..23e0b36d111 100644 --- a/src/backend/nodes/readfuncs.c +++ b/src/backend/nodes/readfuncs.c @@ -538,7 +538,7 @@ _readGroupingFunc(void) READ_NODE_FIELD(args); READ_NODE_FIELD(refs); READ_NODE_FIELD(cols); - READ_INT_FIELD(agglevelsup); + READ_UINT_FIELD(agglevelsup); READ_LOCATION_FIELD(location); READ_DONE(); @@ -1256,9 +1256,9 @@ _readOnConflictExpr(void) READ_ENUM_FIELD(action, OnConflictAction); READ_NODE_FIELD(arbiterElems); READ_NODE_FIELD(arbiterWhere); + READ_OID_FIELD(constraint); READ_NODE_FIELD(onConflictSet); READ_NODE_FIELD(onConflictWhere); - READ_OID_FIELD(constraint); READ_INT_FIELD(exclRelIndex); READ_NODE_FIELD(exclRelTlist); -- cgit v1.2.3