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.

diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 7248440ead363a0960b20a2f5b73f8662e4c85d0..1c8425d37d4cf100d12eec30046ef1b6f27d7962 100644 (file)
--- 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);

diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 6597dbc33e12f9d7e942eb7fa4ca72a566475989..1d6c43c2d6b0b3af93f5672dbc1e4c7fc56815a8 100644 (file)
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -759,9 +759,9 @@ _equalOnConflictExpr(const OnConflictExpr *a, const OnConflictExpr *b)
        COMPARE_SCALAR_FIELD(action);
        COMPARE_NODE_FIELD(arbiterElems);
        COMPARE_NODE_FIELD(arbiterWhere);
+       COMPARE_SCALAR_FIELD(constraint);
        COMPARE_NODE_FIELD(onConflictSet);
        COMPARE_NODE_FIELD(onConflictWhere);
-       COMPARE_SCALAR_FIELD(constraint);
        COMPARE_SCALAR_FIELD(exclRelIndex);
        COMPARE_NODE_FIELD(exclRelTlist);
 
@@ -1868,8 +1868,8 @@ _equalCreateEventTrigStmt(const CreateEventTrigStmt *a, const CreateEventTrigStm
 {
        COMPARE_STRING_FIELD(trigname);
        COMPARE_STRING_FIELD(eventname);
-       COMPARE_NODE_FIELD(funcname);
        COMPARE_NODE_FIELD(whenclause);
+       COMPARE_NODE_FIELD(funcname);
 
        return true;
 }
@@ -2074,7 +2074,7 @@ _equalCreatePolicyStmt(const CreatePolicyStmt *a, const CreatePolicyStmt *b)
 {
        COMPARE_STRING_FIELD(policy_name);
        COMPARE_NODE_FIELD(table);
-       COMPARE_SCALAR_FIELD(cmd);
+       COMPARE_STRING_FIELD(cmd);
        COMPARE_NODE_FIELD(roles);
        COMPARE_NODE_FIELD(qual);
        COMPARE_NODE_FIELD(with_check);

diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 81725d6e59a20d2e2dfc9efea995202e843afb7b..76091834e7025ba99de56fb936530daca0528047 100644 (file)
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -341,7 +341,7 @@ _outModifyTable(StringInfo str, const ModifyTable *node)
        WRITE_NODE_FIELD(arbiterIndexes);
        WRITE_NODE_FIELD(onConflictSet);
        WRITE_NODE_FIELD(onConflictWhere);
-       WRITE_INT_FIELD(exclRelRTI);
+       WRITE_UINT_FIELD(exclRelRTI);
        WRITE_NODE_FIELD(exclRelTlist);
 }
 
@@ -591,6 +591,7 @@ _outCustomScan(StringInfo str, const CustomScan *node)
        _outScanInfo(str, (const Scan *) node);
 
        WRITE_UINT_FIELD(flags);
+       WRITE_NODE_FIELD(custom_plans);
        WRITE_NODE_FIELD(custom_exprs);
        WRITE_NODE_FIELD(custom_private);
        WRITE_NODE_FIELD(custom_scan_tlist);
@@ -1016,7 +1017,7 @@ _outGroupingFunc(StringInfo str, const GroupingFunc *node)
        WRITE_NODE_FIELD(args);
        WRITE_NODE_FIELD(refs);
        WRITE_NODE_FIELD(cols);
-       WRITE_INT_FIELD(agglevelsup);
+       WRITE_UINT_FIELD(agglevelsup);
        WRITE_LOCATION_FIELD(location);
 }
 
@@ -1532,9 +1533,9 @@ _outOnConflictExpr(StringInfo str, const OnConflictExpr *node)
        WRITE_ENUM_FIELD(action, OnConflictAction);
        WRITE_NODE_FIELD(arbiterElems);
        WRITE_NODE_FIELD(arbiterWhere);
+       WRITE_OID_FIELD(constraint);
        WRITE_NODE_FIELD(onConflictSet);
        WRITE_NODE_FIELD(onConflictWhere);
-       WRITE_OID_FIELD(constraint);
        WRITE_INT_FIELD(exclRelIndex);
        WRITE_NODE_FIELD(exclRelTlist);
 }
@@ -1674,6 +1675,7 @@ _outCustomPath(StringInfo str, const CustomPath *node)
        _outPathInfo(str, (const Path *) node);
 
        WRITE_UINT_FIELD(flags);
+       WRITE_NODE_FIELD(custom_paths);
        WRITE_NODE_FIELD(custom_private);
        appendStringInfoString(str, " :methods ");
        _outToken(str, node->methods->CustomName);

diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index 71be840eac9f76a44dfbf258fcec629cdd2268d7..23e0b36d111b27b1154458a21fd54f475b347743 100644 (file)
--- 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);
 

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 0d9355949afae7eed436c7592dcf6934da61e5a0..19c40e4978957c826bcc7354c86b87f92c5cf122 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*                                                     yyyymmddN */
-#define CATALOG_VERSION_NO     201507282
+#define CATALOG_VERSION_NO     201508062
 
 #endif