From 4dc3df9d193838060ec97dd29899e33676796ab5 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 30 Jun 2014 19:57:47 -0400
Subject: [PATCH] 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
---
contrib/pg_upgrade/check.c | 6 +++---
contrib/pg_upgrade/dump.c | 4 ++--
contrib/pg_upgrade/exec.c | 1 +
contrib/pg_upgrade/function.c | 2 +-
contrib/pg_upgrade/info.c | 2 +-
contrib/pg_upgrade/pg_upgrade.c | 2 +-
6 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index edfe7e114b..ba9407d9b5 100644
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -285,9 +285,9 @@ check_cluster_versions(void)
PG_MAJORVERSION);
/*
- * We can't allow downgrading because we use the target pg_dumpall, and
- * pg_dumpall cannot operate on new database versions, only older
- * versions.
+ * We can't allow downgrading because we use the target pg_dump, and
+ * pg_dump cannot operate on newer database versions, only current and
+ * older versions.
*/
if (old_cluster.major_version > new_cluster.major_version)
pg_fatal("This utility cannot be used to downgrade to older major PostgreSQL versions.\n");
diff --git a/contrib/pg_upgrade/dump.c b/contrib/pg_upgrade/dump.c
index 6c7661049c..b112f3a952 100644
--- a/contrib/pg_upgrade/dump.c
+++ b/contrib/pg_upgrade/dump.c
@@ -23,8 +23,8 @@ generate_old_dump(void)
/* run new pg_dumpall binary for globals */
exec_prog(UTILITY_LOG_FILE, NULL, true,
- "\"%s/pg_dumpall\" %s --schema-only --globals-only "
- "--quote-all-identifiers --binary-upgrade %s -f %s",
+ "\"%s/pg_dumpall\" %s --globals-only --quote-all-identifiers "
+ "--binary-upgrade %s -f %s",
new_cluster.bindir, cluster_conn_opts(&old_cluster),
log_opts.verbose ? "--verbose" : "",
GLOBALS_DUMP_FILE);
diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c
index 6c217c902d..c177288255 100644
--- a/contrib/pg_upgrade/exec.c
+++ b/contrib/pg_upgrade/exec.c
@@ -321,6 +321,7 @@ check_bin_dir(ClusterInfo *cluster)
{
/* these are only needed in the new cluster */
validate_exec(cluster->bindir, "psql");
+ validate_exec(cluster->bindir, "pg_dump");
validate_exec(cluster->bindir, "pg_dumpall");
}
}
diff --git a/contrib/pg_upgrade/function.c b/contrib/pg_upgrade/function.c
index f2cd4716c7..a4dec6ea88 100644
--- a/contrib/pg_upgrade/function.c
+++ b/contrib/pg_upgrade/function.c
@@ -161,7 +161,7 @@ get_loadable_libraries(void)
/*
* Systems that install plpython before 8.1 have
* 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
* checks for the problem function, reports affected databases to the
* user and explains how to remove them. 8.1 git commit:
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
index d2968b479a..6205c74574 100644
--- a/contrib/pg_upgrade/info.c
+++ b/contrib/pg_upgrade/info.c
@@ -274,7 +274,7 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
*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
* 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
diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c
index c7386cdd3d..ea1f9f663e 100644
--- a/contrib/pg_upgrade/pg_upgrade.c
+++ b/contrib/pg_upgrade/pg_upgrade.c
@@ -491,7 +491,7 @@ copy_clog_xlog_xid(void)
*
* 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
- * 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
* proper frozen counters.
*/
--
2.49.0