mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove pg_upgrade dependency on the 'postgres' database existing in the

Browse Source 
new cluster.   vacuumdb, used by pg_upgrade, still has this dependency.
This commit is contained in:
Bruce Momjian 2011-10-28 21:18:36 -04:00
parent 53f1ca59b5
commit 51eba98cf4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/pg_upgrade/pg_upgrade.c
View File

@ -52,9 +52,6 @@ static void set_frozenxids(void);
static void setup(char *argv0, bool live_check); static void setup(char *argv0, bool live_check);
static void cleanup(void); static void cleanup(void);
/* This is the database used by pg_dumpall to restore global tables */
#define GLOBAL_DUMP_DB "postgres"
ClusterInfo old_cluster, ClusterInfo old_cluster,
new_cluster; new_cluster;
OSInfo os_info; OSInfo os_info;
@ -233,10 +230,12 @@ prepare_new_databases(void)
prep_status("Creating databases in the new cluster"); prep_status("Creating databases in the new cluster");
/* /*
* Install support functions in the global-restore database to preserve * Install support functions in the global-object restore database to
* pg_authid.oid. * preserve pg_authid.oid. pg_dumpall uses 'template0' as its template
* database so objects we add into 'template1' are not propogated. They
* are removed on pg_upgrade exit.
*/ */
install_support_functions_in_new_db(GLOBAL_DUMP_DB); install_support_functions_in_new_db("template1");
/* /*
* We have to create the databases first so we can install support * We have to create the databases first so we can install support
@ -270,7 +269,7 @@ create_new_objects(void)
DbInfo *new_db = &new_cluster.dbarr.dbs[dbnum]; DbInfo *new_db = &new_cluster.dbarr.dbs[dbnum];
/* skip db we already installed */ /* skip db we already installed */
if (strcmp(new_db->db_name, GLOBAL_DUMP_DB) != 0) if (strcmp(new_db->db_name, "template1") != 0)
install_support_functions_in_new_db(new_db->db_name); install_support_functions_in_new_db(new_db->db_name);
} }
check_ok(); check_ok();