File tree 6 files changed +9
-8
lines changed
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)
285
285
PG_MAJORVERSION );
286
286
287
287
/*
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.
291
291
*/
292
292
if (old_cluster .major_version > new_cluster .major_version )
293
293
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)
23
23
24
24
/* run new pg_dumpall binary for globals */
25
25
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" ,
28
28
new_cluster .bindir , cluster_conn_opts (& old_cluster ),
29
29
log_opts .verbose ? "--verbose" : "" ,
30
30
GLOBALS_DUMP_FILE );
Original file line number Diff line number Diff line change @@ -321,6 +321,7 @@ check_bin_dir(ClusterInfo *cluster)
321
321
{
322
322
/* these are only needed in the new cluster */
323
323
validate_exec (cluster -> bindir , "psql" );
324
+ validate_exec (cluster -> bindir , "pg_dump" );
324
325
validate_exec (cluster -> bindir , "pg_dumpall" );
325
326
}
326
327
}
Original file line number Diff line number Diff line change @@ -161,7 +161,7 @@ get_loadable_libraries(void)
161
161
/*
162
162
* Systems that install plpython before 8.1 have
163
163
* 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
165
165
* "plpython" (no "2"), so it throws an error on restore. This code
166
166
* checks for the problem function, reports affected databases to the
167
167
* 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)
274
274
* last_tablespace = NULL ;
275
275
276
276
/*
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
278
278
* --schema-only output, so we have to copy that system table heap and
279
279
* index. We could grab the pg_largeobject oids from template1, but it is
280
280
* 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)
491
491
*
492
492
* We have frozen all xids, so set relfrozenxid and datfrozenxid
493
493
* 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
495
495
* --binary-upgrade, but objects not set by the pg_dump must have
496
496
* proper frozen counters.
497
497
*/
You can’t perform that action at this time.
0 commit comments