git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

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

2017年6月16日 07:16:11 +0000 (00:16 -0700)

committer Noah Misch <noah@leadboat.com>

2017年6月16日 07:16:11 +0000 (00:16 -0700)

The _equalTableFunc() omission of coltypmods has semantic significance,
but I did not track down resulting user-visible bugs, if any. The other
changes are cosmetic only, affecting order. catversion bump due to
readfuncs.c field order change.

src/backend/nodes/copyfuncs.c patch | blob | blame | history

src/backend/nodes/equalfuncs.c patch | blob | blame | history

src/backend/nodes/outfuncs.c patch | blob | blame | history

src/backend/nodes/readfuncs.c patch | blob | blame | history

src/include/catalog/catversion.h patch | blob | blame | history

diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c

index 02451c2a7130077ea72e5096a811dbd582c21abf..67ac8145a0ed365b179bc017a07f67eb1de36069 100644 (file)

--- a/src/backend/nodes/copyfuncs.c

+++ b/src/backend/nodes/copyfuncs.c

@@ -1222,8 +1222,8 @@ _copyTableFunc(const TableFunc *from)

{

TableFunc *newnode = makeNode(TableFunc);

- COPY_NODE_FIELD(ns_names);

COPY_NODE_FIELD(ns_uris);

+ COPY_NODE_FIELD(ns_names);

COPY_NODE_FIELD(docexpr);

COPY_NODE_FIELD(rowexpr);

COPY_NODE_FIELD(colnames);

@@ -4005,8 +4005,8 @@ _copyCreateForeignServerStmt(const CreateForeignServerStmt *from)

COPY_STRING_FIELD(servertype);

COPY_STRING_FIELD(version);

COPY_STRING_FIELD(fdwname);

- COPY_NODE_FIELD(options);

COPY_SCALAR_FIELD(if_not_exists);

+ COPY_NODE_FIELD(options);

return newnode;

}

@@ -4031,8 +4031,8 @@ _copyCreateUserMappingStmt(const CreateUserMappingStmt *from)

COPY_NODE_FIELD(user);

COPY_STRING_FIELD(servername);

- COPY_NODE_FIELD(options);

COPY_SCALAR_FIELD(if_not_exists);

+ COPY_NODE_FIELD(options);

return newnode;

}

diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c

index c88d09f7c65661e19262129c7acaaf9e312d69f8..ed51e1f6e09bb0ceed5df7e726be36ce81d3aa09 100644 (file)

--- a/src/backend/nodes/equalfuncs.c

+++ b/src/backend/nodes/equalfuncs.c

@@ -119,13 +119,13 @@ _equalRangeVar(const RangeVar *a, const RangeVar *b)

static bool

_equalTableFunc(const TableFunc *a, const TableFunc *b)

{

- COMPARE_NODE_FIELD(ns_names);

COMPARE_NODE_FIELD(ns_uris);

+ COMPARE_NODE_FIELD(ns_names);

COMPARE_NODE_FIELD(docexpr);

COMPARE_NODE_FIELD(rowexpr);

COMPARE_NODE_FIELD(colnames);

COMPARE_NODE_FIELD(coltypes);

- COMPARE_NODE_FIELD(coltypes);

+ COMPARE_NODE_FIELD(coltypmods);

COMPARE_NODE_FIELD(colcollations);

COMPARE_NODE_FIELD(colexprs);

COMPARE_NODE_FIELD(coldefexprs);

@@ -1231,8 +1231,8 @@ _equalCreateStmt(const CreateStmt *a, const CreateStmt *b)

COMPARE_NODE_FIELD(relation);

COMPARE_NODE_FIELD(tableElts);

COMPARE_NODE_FIELD(inhRelations);

- COMPARE_NODE_FIELD(partspec);

COMPARE_NODE_FIELD(partbound);

+ COMPARE_NODE_FIELD(partspec);

COMPARE_NODE_FIELD(ofTypename);

COMPARE_NODE_FIELD(constraints);

COMPARE_NODE_FIELD(options);

@@ -1869,8 +1869,8 @@ _equalCreateForeignServerStmt(const CreateForeignServerStmt *a, const CreateFore

COMPARE_STRING_FIELD(servertype);

COMPARE_STRING_FIELD(version);

COMPARE_STRING_FIELD(fdwname);

- COMPARE_NODE_FIELD(options);

COMPARE_SCALAR_FIELD(if_not_exists);

+ COMPARE_NODE_FIELD(options);

return true;

}

@@ -1891,8 +1891,8 @@ _equalCreateUserMappingStmt(const CreateUserMappingStmt *a, const CreateUserMapp

{

COMPARE_NODE_FIELD(user);

COMPARE_STRING_FIELD(servername);

- COMPARE_NODE_FIELD(options);

COMPARE_SCALAR_FIELD(if_not_exists);

+ COMPARE_NODE_FIELD(options);

return true;

}

@@ -2507,7 +2507,6 @@ _equalRangeTableFuncCol(const RangeTableFuncCol *a, const RangeTableFuncCol *b)

COMPARE_STRING_FIELD(colname);

COMPARE_NODE_FIELD(typeName);

COMPARE_SCALAR_FIELD(for_ordinality);

- COMPARE_NODE_FIELD(typeName);

COMPARE_SCALAR_FIELD(is_not_null);

COMPARE_NODE_FIELD(colexpr);

COMPARE_NODE_FIELD(coldefexpr);

@@ -2605,7 +2604,6 @@ _equalLockingClause(const LockingClause *a, const LockingClause *b)

COMPARE_NODE_FIELD(lockedRels);

COMPARE_SCALAR_FIELD(strength);

COMPARE_SCALAR_FIELD(waitPolicy);

- COMPARE_LOCATION_FIELD(location);

return true;

}

@@ -2622,8 +2620,8 @@ _equalRangeTblEntry(const RangeTblEntry *a, const RangeTblEntry *b)

COMPARE_SCALAR_FIELD(jointype);

COMPARE_NODE_FIELD(joinaliasvars);

COMPARE_NODE_FIELD(functions);

- COMPARE_NODE_FIELD(tablefunc);

COMPARE_SCALAR_FIELD(funcordinality);

+ COMPARE_NODE_FIELD(tablefunc);

COMPARE_NODE_FIELD(values_lists);

COMPARE_STRING_FIELD(ctename);

COMPARE_SCALAR_FIELD(ctelevelsup);

diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c

index 4fd2ca50c02183b675b56ed7e9a44350d8964370..3a23f0bb164b31d4ab6413b38d51bbd3ef27fef5 100644 (file)

--- a/src/backend/nodes/outfuncs.c

+++ b/src/backend/nodes/outfuncs.c

@@ -1018,8 +1018,8 @@ _outTableFunc(StringInfo str, const TableFunc *node)

{

WRITE_NODE_TYPE("TABLEFUNC");

- WRITE_NODE_FIELD(ns_names);

WRITE_NODE_FIELD(ns_uris);

+ WRITE_NODE_FIELD(ns_names);

WRITE_NODE_FIELD(docexpr);

WRITE_NODE_FIELD(rowexpr);

WRITE_NODE_FIELD(colnames);

diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c

index 039910e1f7003da568b8b841424590d9874c525e..84147f975417c221a9fee7500a5f902676b689d4 100644 (file)

--- a/src/backend/nodes/readfuncs.c

+++ b/src/backend/nodes/readfuncs.c

@@ -467,8 +467,8 @@ _readTableFunc(void)

{

READ_LOCALS(TableFunc);

- READ_NODE_FIELD(ns_names);

READ_NODE_FIELD(ns_uris);

+ READ_NODE_FIELD(ns_names);

READ_NODE_FIELD(docexpr);

READ_NODE_FIELD(rowexpr);

READ_NODE_FIELD(colnames);

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h

index 8b2ec21509aae2b3f83e1a41e097e205e732da4e..374c86311e75e746a0dd44a1be2909f762ff0d5c 100644 (file)

--- a/src/include/catalog/catversion.h

+++ b/src/include/catalog/catversion.h

@@ -53,6 +53,6 @@

/* yyyymmddN */

-#define CATALOG_VERSION_NO 201706141

+#define CATALOG_VERSION_NO 201706161

#endif

This is the main PostgreSQL git repository.

RSS Atom