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

git projects / postgresql.git / commitdiff

author Robert Haas <rhaas@postgresql.org>

2022年2月17日 15:53:51 +0000 (10:53 -0500)

committer Robert Haas <rhaas@postgresql.org>

2022年2月17日 15:53:51 +0000 (10:53 -0500)

Commit 9a974cbcba005256a19991203583a94b4f9a21a9 arranged for
pg_dumpall to preserve tablespace OIDs, but it should only do that
in binary upgrade mode, not all the time.

Reported by Christoph Berg.

Discussion: http://postgr.es/m/YgjwrkEvNEqoz4Vm@msg.df7cb.de

src/bin/pg_dump/pg_dumpall.c patch | blob | blame | history

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c

index 10383c713fee56a4247eb7b8e027843c15444679..9c9f7c6d63c08715142ad1cf97437f5f5bbae634 100644 (file)

--- a/src/bin/pg_dump/pg_dumpall.c

+++ b/src/bin/pg_dump/pg_dumpall.c

@@ -1066,8 +1066,11 @@ dumpTablespaces(PGconn *conn)

/* needed for buildACLCommands() */

fspcname = pg_strdup(fmtId(spcname));

- appendPQExpBufferStr(buf, "\n-- For binary upgrade, must preserve pg_tablespace oid\n");

- appendPQExpBuffer(buf, "SELECT pg_catalog.binary_upgrade_set_next_pg_tablespace_oid('%u'::pg_catalog.oid);\n", spcoid);

+ if (binary_upgrade)

+ {

+ appendPQExpBufferStr(buf, "\n-- For binary upgrade, must preserve pg_tablespace oid\n");

+ appendPQExpBuffer(buf, "SELECT pg_catalog.binary_upgrade_set_next_pg_tablespace_oid('%u'::pg_catalog.oid);\n", spcoid);

+ }

appendPQExpBuffer(buf, "CREATE TABLESPACE %s", fspcname);

appendPQExpBuffer(buf, " OWNER %s", fmtId(spcowner));

This is the main PostgreSQL git repository.

RSS Atom