mirror of
https://github.com/postgres/postgres.git
synced 2025-11-07 19:06:32 +03:00
Fix problems related to RangeTblEntry members enrname and enrtuples.
Commit 18ce3a4ab2 failed to update
the comments in parsenodes.h for the new members, and made only
incomplete updates to src/backend/nodes
Thomas Munro, per a report from Noah Misch.
Discussion: http://postgr.es/m/20170611062525.GA1628882@rfd.leadboat.com
This commit is contained in:
@@ -2303,10 +2303,11 @@ _copyRangeTblEntry(const RangeTblEntry *from)
|
||||
COPY_STRING_FIELD(ctename);
|
||||
COPY_SCALAR_FIELD(ctelevelsup);
|
||||
COPY_SCALAR_FIELD(self_reference);
|
||||
COPY_STRING_FIELD(enrname);
|
||||
COPY_NODE_FIELD(coltypes);
|
||||
COPY_NODE_FIELD(coltypmods);
|
||||
COPY_NODE_FIELD(colcollations);
|
||||
COPY_STRING_FIELD(enrname);
|
||||
COPY_SCALAR_FIELD(enrtuples);
|
||||
COPY_NODE_FIELD(alias);
|
||||
COPY_NODE_FIELD(eref);
|
||||
COPY_SCALAR_FIELD(lateral);
|
||||
|
||||
@@ -2631,6 +2631,8 @@ _equalRangeTblEntry(const RangeTblEntry *a, const RangeTblEntry *b)
|
||||
COMPARE_NODE_FIELD(coltypes);
|
||||
COMPARE_NODE_FIELD(coltypmods);
|
||||
COMPARE_NODE_FIELD(colcollations);
|
||||
COMPARE_STRING_FIELD(enrname);
|
||||
COMPARE_SCALAR_FIELD(enrtuples);
|
||||
COMPARE_NODE_FIELD(alias);
|
||||
COMPARE_NODE_FIELD(eref);
|
||||
COMPARE_SCALAR_FIELD(lateral);
|
||||
|
||||
@@ -3047,6 +3047,7 @@ _outRangeTblEntry(StringInfo str, const RangeTblEntry *node)
|
||||
break;
|
||||
case RTE_NAMEDTUPLESTORE:
|
||||
WRITE_STRING_FIELD(enrname);
|
||||
WRITE_FLOAT_FIELD(enrtuples, "%.0f");
|
||||
WRITE_OID_FIELD(relid);
|
||||
WRITE_NODE_FIELD(coltypes);
|
||||
WRITE_NODE_FIELD(coltypmods);
|
||||
|
||||
@@ -1358,6 +1358,7 @@ _readRangeTblEntry(void)
|
||||
break;
|
||||
case RTE_NAMEDTUPLESTORE:
|
||||
READ_STRING_FIELD(enrname);
|
||||
READ_FLOAT_FIELD(enrtuples);
|
||||
READ_OID_FIELD(relid);
|
||||
READ_NODE_FIELD(coltypes);
|
||||
READ_NODE_FIELD(coltypmods);
|
||||
|
||||
Reference in New Issue
Block a user