database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00
Code Activity

pg_dump, pg_upgrade: allow postgres/template1 tablespace moves

Browse Source 
Modify pg_dump to restore postgres/template1 databases to non-default
tablespaces by switching out of the database to be moved, then switching
back.

Also, to fix potentially cases where the old/new tablespaces might not
match, fix pg_upgrade to process new/old tablespaces separately in all
cases.

Report by Marti Raudsepp

Patch by Marti Raudsepp, me

Backpatch through 9.0
This commit is contained in:
Bruce Momjian
2015-09-11 15:51:10 -04:00
parent a3b420e6c8
commit c5391e9334
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/bin/pg_dump/pg_dumpall.c
View File

@@ -1326,6 +1326,28 @@ dumpCreateDB(PGconn *conn)
appendPQExpBuffer(buf, ";\n");
}
}
else if (strcmp(dbtablespace, "pg_default") != 0 && !no_tablespaces)
{
/*
* Cannot change tablespace of the database we're connected to,
* so to move "postgres" to another tablespace, we connect to
* "template1", and vice versa.
*/
if (strcmp(dbname, "postgres") == 0)
appendPQExpBuffer(buf, "%s\\connect template1\n",
/* Add a space before \\connect so pg_upgrade can split */
binary_upgrade ? " " : "");
else
appendPQExpBuffer(buf, "%s\\connect postgres\n",
binary_upgrade ? " " : "");
appendPQExpBuffer(buf, "ALTER DATABASE %s SET TABLESPACE %s;\n",
fdbname, fmtId(dbtablespace));
/* connect to original database */
appendPQExpBuffer(buf, "%s\\connect %s\n",
binary_upgrade ? " " : "", fdbname);
}
if (binary_upgrade)
{