database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-08 06:02:22 +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:11 -04:00
parent 7d0712890d
commit 35d2fc1f29
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/pg_upgrade/info.c
View File

@@ -140,6 +140,7 @@ create_rel_filename_map(const char *old_data, const char *new_data,
const RelInfo *old_rel, const RelInfo *new_rel,
FileNameMap *map)
{
/* In case old/new tablespaces don't match, do them separately. */
if (strlen(old_rel->tablespace) == 0)
{
/*
@@ -147,16 +148,24 @@ create_rel_filename_map(const char *old_data, const char *new_data,
* exist in the data directories.
*/
map->old_tablespace = old_data;
map->new_tablespace = new_data;
map->old_tablespace_suffix = "/base";
map->new_tablespace_suffix = "/base";
}
else
{
/* relation belongs to a tablespace, so use the tablespace location */
map->old_tablespace = old_rel->tablespace;
map->new_tablespace = new_rel->tablespace;
map->old_tablespace_suffix = old_cluster.tablespace_suffix;
}
/* Do the same for new tablespaces */
if (strlen(new_rel->tablespace) == 0)
{
map->new_tablespace = new_data;
map->new_tablespace_suffix = "/base";
}
else
{
map->new_tablespace = new_rel->tablespace;
map->new_tablespace_suffix = new_cluster.tablespace_suffix;
}