database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00
Code Activity

Remove all mentions of EnterpriseDB Advanced Server from pg_upgrade;

Browse Source 
EDB must maintain their own patch set for this.
This commit is contained in:
Bruce Momjian
2010-05-13 22:51:00 +00:00
parent 382ff21203
commit 36d3afd2d4
9 changed files with 20 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/pg_upgrade/pg_upgrade.c
View File

@ -196,10 +196,10 @@ prepare_new_databases(migratorContext *ctx)
*/
prep_status(ctx, "Creating databases in the new cluster");
exec_prog(ctx, true,
SYSTEMQUOTE "\"%s/%s\" --set ON_ERROR_STOP=on --port %d "
SYSTEMQUOTE "\"%s/psql\" --set ON_ERROR_STOP=on --port %d "
"-f \"%s/%s\" --dbname template1 >> \"%s\"" SYSTEMQUOTE,
ctx->new.bindir, ctx->new.psql_exe, ctx->new.port,
ctx->output_dir, GLOBALS_DUMP_FILE, ctx->logfile);
ctx->new.bindir, ctx->new.port, ctx->output_dir,
GLOBALS_DUMP_FILE, ctx->logfile);
check_ok(ctx);
get_db_and_rel_infos(ctx, &ctx->new.dbarr, CLUSTER_NEW);
@ -218,10 +218,10 @@ create_new_objects(migratorContext *ctx)
prep_status(ctx, "Restoring database schema to new cluster");
exec_prog(ctx, true,
SYSTEMQUOTE "\"%s/%s\" --set ON_ERROR_STOP=on --port %d "
SYSTEMQUOTE "\"%s/psql\" --set ON_ERROR_STOP=on --port %d "
"-f \"%s/%s\" --dbname template1 >> \"%s\"" SYSTEMQUOTE,
ctx->new.bindir, ctx->new.psql_exe, ctx->new.port,
ctx->output_dir, DB_DUMP_FILE, ctx->logfile);
ctx->new.bindir, ctx->new.port, ctx->output_dir,
DB_DUMP_FILE, ctx->logfile);
check_ok(ctx);
/* regenerate now that we have db schemas */