Skip to content

Commit 44982e7

Browse files
committed
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.
1 parent cf4263c commit 44982e7

File tree

4 files changed

+1
-6
lines changed

4 files changed

+1
-6
lines changed

src/backend/nodes/outfuncs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ _outIntoClause(StringInfo str, const IntoClause *node)
10481048

10491049
WRITE_NODE_FIELD(rel);
10501050
WRITE_NODE_FIELD(colNames);
1051-
WRITE_NODE_FIELD(accessMethod);
1051+
WRITE_STRING_FIELD(accessMethod);
10521052
WRITE_NODE_FIELD(options);
10531053
WRITE_ENUM_FIELD(onCommit, OnCommitAction);
10541054
WRITE_STRING_FIELD(tableSpaceName);

src/backend/parser/parse_node.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@ transformContainerSubscripts(ParseState *pstate,
306306
bool isSlice = false;
307307
List *upperIndexpr = NIL;
308308
List *lowerIndexpr = NIL;
309-
List *indexprSlice = NIL;
310309
ListCell *idx;
311310
SubscriptingRef *sbsref;
312311

@@ -450,7 +449,6 @@ transformContainerSubscripts(ParseState *pstate,
450449
/* refcollid will be set by parse_collate.c */
451450
sbsref->refupperindexpr = upperIndexpr;
452451
sbsref->reflowerindexpr = lowerIndexpr;
453-
sbsref->refindexprslice = indexprSlice;
454452
sbsref->refexpr = (Expr *) containerBase;
455453
sbsref->refassgnexpr = (Expr *) assignFrom;
456454

src/include/nodes/parsenodes.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2139,7 +2139,6 @@ typedef struct Constraint
21392139
Node *raw_expr; /* expr, as untransformed parse tree */
21402140
char *cooked_expr; /* expr, as nodeToString representation */
21412141
char generated_when; /* ALWAYS or BY DEFAULT */
2142-
char generated_kind; /* currently always STORED */
21432142

21442143
/* Fields used for unique constraints (UNIQUE and PRIMARY KEY): */
21452144
List *keys; /* String nodes naming referenced key

src/include/nodes/primnodes.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,6 @@ typedef struct SubscriptingRef
410410
List *reflowerindexpr; /* expressions that evaluate to lower
411411
* container indexes, or NIL for single
412412
* container element */
413-
List *refindexprslice; /* whether or not related indexpr from
414-
* reflowerindexpr is a slice */
415413
Expr *refexpr; /* the expression that evaluates to a
416414
* container value */
417415

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy