rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pg_upgrade: update C comments about pg_dumpall 

There were some C comments that hadn't been updated from the switch of
using only pg_dumpall to using pg_dump and pg_dumpall, so update them.
Also, don't bother using --schema-only for pg_dumpall --globals-only.

Backpatch through 9.4
This commit is contained in:
Bruce Momjian 2014-06-30 19:55:55 -04:00
parent 9d0826c595
commit 55863274d9
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/pg_upgrade/check.c
View File

@ -285,9 +285,9 @@ check_cluster_versions(void)
PG_MAJORVERSION); PG_MAJORVERSION);
/* /*
* We can't allow downgrading because we use the target pg_dumpall, and * We can't allow downgrading because we use the target pg_dump, and
* pg_dumpall cannot operate on new database versions, only older * pg_dump cannot operate on newer database versions, only current and
* versions. * older versions.
*/ */
if (old_cluster.major_version > new_cluster.major_version) if (old_cluster.major_version > new_cluster.major_version)
pg_fatal("This utility cannot be used to downgrade to older major PostgreSQL versions.\n"); pg_fatal("This utility cannot be used to downgrade to older major PostgreSQL versions.\n");

4
contrib/pg_upgrade/dump.c
View File

@ -23,8 +23,8 @@ generate_old_dump(void)
/* run new pg_dumpall binary for globals */ /* run new pg_dumpall binary for globals */
exec_prog(UTILITY_LOG_FILE, NULL, true, exec_prog(UTILITY_LOG_FILE, NULL, true,
"\"%s/pg_dumpall\" %s --schema-only --globals-only " "\"%s/pg_dumpall\" %s --globals-only --quote-all-identifiers "
"--quote-all-identifiers --binary-upgrade %s -f %s", "--binary-upgrade %s -f %s",
new_cluster.bindir, cluster_conn_opts(&old_cluster), new_cluster.bindir, cluster_conn_opts(&old_cluster),
log_opts.verbose ? "--verbose" : "", log_opts.verbose ? "--verbose" : "",
GLOBALS_DUMP_FILE); GLOBALS_DUMP_FILE);

1
contrib/pg_upgrade/exec.c
View File

@ -321,6 +321,7 @@ check_bin_dir(ClusterInfo *cluster)
{ {
/* these are only needed in the new cluster */ /* these are only needed in the new cluster */
validate_exec(cluster->bindir, "psql"); validate_exec(cluster->bindir, "psql");
validate_exec(cluster->bindir, "pg_dump");
validate_exec(cluster->bindir, "pg_dumpall"); validate_exec(cluster->bindir, "pg_dumpall");
} }
} }

2
contrib/pg_upgrade/function.c
View File

@ -161,7 +161,7 @@ get_loadable_libraries(void)
/* /*
* Systems that install plpython before 8.1 have * Systems that install plpython before 8.1 have
* plpython_call_handler() defined in the "public" schema, causing * plpython_call_handler() defined in the "public" schema, causing
* pg_dumpall to dump it. However that function still references * pg_dump to dump it. However that function still references
* "plpython" (no "2"), so it throws an error on restore. This code * "plpython" (no "2"), so it throws an error on restore. This code
* checks for the problem function, reports affected databases to the * checks for the problem function, reports affected databases to the
* user and explains how to remove them. 8.1 git commit: * user and explains how to remove them. 8.1 git commit:

2
contrib/pg_upgrade/info.c
View File

@ -274,7 +274,7 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
*last_tablespace = NULL; *last_tablespace = NULL;
/* /*
* pg_largeobject contains user data that does not appear in pg_dumpall * pg_largeobject contains user data that does not appear in pg_dump
* --schema-only output, so we have to copy that system table heap and * --schema-only output, so we have to copy that system table heap and
* index. We could grab the pg_largeobject oids from template1, but it is * index. We could grab the pg_largeobject oids from template1, but it is
* easy to treat it as a normal table. Order by oid so we can join old/new * easy to treat it as a normal table. Order by oid so we can join old/new

2
contrib/pg_upgrade/pg_upgrade.c
View File

@ -491,7 +491,7 @@ copy_clog_xlog_xid(void)
* *
* We have frozen all xids, so set relfrozenxid and datfrozenxid * We have frozen all xids, so set relfrozenxid and datfrozenxid
* to be the old cluster's xid counter, which we just set in the new * to be the old cluster's xid counter, which we just set in the new
* cluster. User-table frozenxid values will be set by pg_dumpall * cluster. User-table frozenxid values will be set by pg_dump
* --binary-upgrade, but objects not set by the pg_dump must have * --binary-upgrade, but objects not set by the pg_dump must have
* proper frozen counters. * proper frozen counters.
*/ */