diff options
| author | Bruce Momjian <bruce@momjian.us> | 2010-07-13 15:56:53 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2010-07-13 15:56:53 +0000 |
| commit | 804f96accbfe25a13f464788f0b8f1266430cedc (patch) | |
| tree | c5b9bd1fe5f0230b06ea0abec64c64615ae2ee1a | |
| parent | 2751a249cbb314990642c67cf1ad7d638eac5911 (diff) | |
| download | postgresql-804f96accbfe25a13f464788f0b8f1266430cedc.tar.gz postgresql-804f96accbfe25a13f464788f0b8f1266430cedc.zip | |
In pg_upgrade, prevent psql AUTOCOMMIT=off by not loading .psqlrc.
| -rw-r--r-- | contrib/pg_upgrade/check.c | 8 | ||||
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.c | 15 |
2 files changed, 12 insertions, 11 deletions
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c index 0e96705b2d1..cdf213dac59 100644 --- a/contrib/pg_upgrade/check.c +++ b/contrib/pg_upgrade/check.c @@ -4,7 +4,7 @@ * server checks and output routines * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/check.c,v 1.11 2010/07/06 19:18:55 momjian Exp $ + * $PostgreSQL: pgsql/contrib/pg_upgrade/check.c,v 1.12 2010/07/13 15:56:53 momjian Exp $ */ #include "pg_upgrade.h" @@ -152,9 +152,9 @@ issue_warnings(migratorContext *ctx, char *sequence_script_file_name) { prep_status(ctx, "Adjusting sequences"); exec_prog(ctx, true, - SYSTEMQUOTE "\"%s/psql\" --set ON_ERROR_STOP=on --port %d " - "--username \"%s\" -f \"%s\" --dbname template1 >> \"%s\"" - SYSTEMQUOTE, + SYSTEMQUOTE "\"%s/psql\" --set ON_ERROR_STOP=on " + "--no-psqlrc --port %d --username \"%s\" " + "-f \"%s\" --dbname template1 >> \"%s\"" SYSTEMQUOTE, ctx->new.bindir, ctx->new.port, ctx->user, sequence_script_file_name, ctx->logfile); unlink(sequence_script_file_name); diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c index 695596ba603..414ac090bdc 100644 --- a/contrib/pg_upgrade/pg_upgrade.c +++ b/contrib/pg_upgrade/pg_upgrade.c @@ -4,7 +4,7 @@ * main source file * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/pg_upgrade.c,v 1.10 2010/07/06 19:18:55 momjian Exp $ + * $PostgreSQL: pgsql/contrib/pg_upgrade/pg_upgrade.c,v 1.11 2010/07/13 15:56:53 momjian Exp $ */ #include "pg_upgrade.h" @@ -202,9 +202,10 @@ prepare_new_databases(migratorContext *ctx) */ prep_status(ctx, "Creating databases in the new cluster"); exec_prog(ctx, true, - SYSTEMQUOTE "\"%s/psql\" --port %d --username \"%s\" " - "--set ON_ERROR_STOP=on -f \"%s/%s\" --dbname template1 >> \"%s\"" - SYSTEMQUOTE, + SYSTEMQUOTE "\"%s/psql\" --set ON_ERROR_STOP=on " + /* --no-psqlrc prevents AUTOCOMMIT=off */ + "--no-psqlrc --port %d --username \"%s\" " + "-f \"%s/%s\" --dbname template1 >> \"%s\"" SYSTEMQUOTE, ctx->new.bindir, ctx->new.port, ctx->user, ctx->cwd, GLOBALS_DUMP_FILE, ctx->logfile); check_ok(ctx); @@ -225,9 +226,9 @@ create_new_objects(migratorContext *ctx) prep_status(ctx, "Restoring database schema to new cluster"); exec_prog(ctx, true, - SYSTEMQUOTE "\"%s/psql\" --port %d --username \"%s\" " - "--set ON_ERROR_STOP=on -f \"%s/%s\" --dbname template1 >> \"%s\"" - SYSTEMQUOTE, + SYSTEMQUOTE "\"%s/psql\" --set ON_ERROR_STOP=on " + "--no-psqlrc --port %d --username \"%s\" " + "-f \"%s/%s\" --dbname template1 >> \"%s\"" SYSTEMQUOTE, ctx->new.bindir, ctx->new.port, ctx->user, ctx->cwd, DB_DUMP_FILE, ctx->logfile); check_ok(ctx); |