File tree Expand file tree Collapse file tree 6 files changed +9
-8
lines changed Expand file tree Collapse file tree 6 files changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -285,9 +285,9 @@ check_cluster_versions(void)
285285 PG_MAJORVERSION );
286286
287287 /*
288- * We can't allow downgrading because we use the target pg_dumpall , and
289- * pg_dumpall cannot operate on new database versions, only older
290- * versions.
288+ * We can't allow downgrading because we use the target pg_dump , and
289+ * pg_dump cannot operate on newer database versions, only current and
290+ * older versions.
291291 */
292292 if (old_cluster .major_version > new_cluster .major_version )
293293 pg_fatal ("This utility cannot be used to downgrade to older major PostgreSQL versions.\n" );
Original file line number Diff line number Diff line change @@ -23,8 +23,8 @@ generate_old_dump(void)
2323
2424 /* run new pg_dumpall binary for globals */
2525 exec_prog (UTILITY_LOG_FILE , NULL , true,
26- "\"%s/pg_dumpall\" %s --schema -only --globals-only "
27- "--quote-all-identifiers -- binary-upgrade %s -f %s" ,
26+ "\"%s/pg_dumpall\" %s --globals -only --quote-all-identifiers "
27+ "--binary-upgrade %s -f %s" ,
2828 new_cluster .bindir , cluster_conn_opts (& old_cluster ),
2929 log_opts .verbose ? "--verbose" : "" ,
3030 GLOBALS_DUMP_FILE );
Original file line number Diff line number Diff line change @@ -321,6 +321,7 @@ check_bin_dir(ClusterInfo *cluster)
321321 {
322322 /* these are only needed in the new cluster */
323323 validate_exec (cluster -> bindir , "psql" );
324+ validate_exec (cluster -> bindir , "pg_dump" );
324325 validate_exec (cluster -> bindir , "pg_dumpall" );
325326 }
326327}
Original file line number Diff line number Diff line change @@ -161,7 +161,7 @@ get_loadable_libraries(void)
161161 /*
162162 * Systems that install plpython before 8.1 have
163163 * plpython_call_handler() defined in the "public" schema, causing
164- * pg_dumpall to dump it. However that function still references
164+ * pg_dump to dump it. However that function still references
165165 * "plpython" (no "2"), so it throws an error on restore. This code
166166 * checks for the problem function, reports affected databases to the
167167 * user and explains how to remove them. 8.1 git commit:
Original file line number Diff line number Diff line change @@ -274,7 +274,7 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
274274 * last_tablespace = NULL ;
275275
276276 /*
277- * pg_largeobject contains user data that does not appear in pg_dumpall
277+ * pg_largeobject contains user data that does not appear in pg_dump
278278 * --schema-only output, so we have to copy that system table heap and
279279 * index. We could grab the pg_largeobject oids from template1, but it is
280280 * easy to treat it as a normal table. Order by oid so we can join old/new
Original file line number Diff line number Diff line change @@ -491,7 +491,7 @@ copy_clog_xlog_xid(void)
491491 *
492492 * We have frozen all xids, so set relfrozenxid and datfrozenxid
493493 * to be the old cluster's xid counter, which we just set in the new
494- * cluster. User-table frozenxid values will be set by pg_dumpall
494+ * cluster. User-table frozenxid values will be set by pg_dump
495495 * --binary-upgrade, but objects not set by the pg_dump must have
496496 * proper frozen counters.
497497 */
You can’t perform that action at this time.
0 commit comments