In pg_upgrade, prevent psql AUTOCOMMIT=off by not loading .psqlrc.

diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index 0e96705b2d181b12c7374bd8e89476b6416edc44..cdf213dac59ae82a53fd99f968614c8e5bacf0a6 100644 (file)
--- 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 695596ba603a14bd76794ad4fc08c8ef9a351473..414ac090bdc39df8aab567037e35b2d6c535607f 100644 (file)
--- 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);