Reconcile nodes/*funcs.c with PostgreSQL 12 work.

One would have needed out-of-tree code to observe the defects.  Remove
unreferenced fields instead of completing their support functions.
Since in-tree code can't reach _readIntoClause(), no catversion bump.

diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 237598e11092b337aa89fd7ff51f38940ace2755..8400dd319e23fe166a5a3462842e0217ef423920 100644 (file)
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -1048,7 +1048,7 @@ _outIntoClause(StringInfo str, const IntoClause *node)
 
        WRITE_NODE_FIELD(rel);
        WRITE_NODE_FIELD(colNames);
-       WRITE_NODE_FIELD(accessMethod);
+       WRITE_STRING_FIELD(accessMethod);
        WRITE_NODE_FIELD(options);
        WRITE_ENUM_FIELD(onCommit, OnCommitAction);
        WRITE_STRING_FIELD(tableSpaceName);

diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index 3a7a858e3ad6e89c934fa60052d8648790a21ce3..1baf7ef31f1608a5fda979b7ea577019b894daf1 100644 (file)
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -306,7 +306,6 @@ transformContainerSubscripts(ParseState *pstate,
        bool            isSlice = false;
        List       *upperIndexpr = NIL;
        List       *lowerIndexpr = NIL;
-       List       *indexprSlice = NIL;
        ListCell   *idx;
        SubscriptingRef *sbsref;
 
@@ -450,7 +449,6 @@ transformContainerSubscripts(ParseState *pstate,
        /* refcollid will be set by parse_collate.c */
        sbsref->refupperindexpr = upperIndexpr;
        sbsref->reflowerindexpr = lowerIndexpr;
-       sbsref->refindexprslice = indexprSlice;
        sbsref->refexpr = (Expr *) containerBase;
        sbsref->refassgnexpr = (Expr *) assignFrom;
 

diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 2a8edf934f6c3c951d4fc8a6deac9271d758c4f6..94ded3c135ed8efea3b417820607bfeceb10ce22 100644 (file)
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -2139,7 +2139,6 @@ typedef struct Constraint
        Node       *raw_expr;           /* expr, as untransformed parse tree */
        char       *cooked_expr;        /* expr, as nodeToString representation */
        char            generated_when; /* ALWAYS or BY DEFAULT */
-       char            generated_kind; /* currently always STORED */
 
        /* Fields used for unique constraints (UNIQUE and PRIMARY KEY): */
        List       *keys;                       /* String nodes naming referenced key

diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index f9b1cf2df72a3472b280f343198af3c5afd3e99c..7c278c0e56e91c651d9abba56b489a179ec3271e 100644 (file)
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -410,8 +410,6 @@ typedef struct SubscriptingRef
        List       *reflowerindexpr;    /* expressions that evaluate to lower
                                                                         * container indexes, or NIL for single
                                                                         * container element */
-       List       *refindexprslice;    /* whether or not related indexpr from
-                                                                        * reflowerindexpr is a slice */
        Expr       *refexpr;            /* the expression that evaluates to a
                                                                 * container value */