Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit804f96a

Browse files
committed
In pg_upgrade, prevent psql AUTOCOMMIT=off by not loading .psqlrc.
1 parent2751a24 commit804f96a

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

‎contrib/pg_upgrade/check.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*server checks and output routines
55
*
66
*Copyright (c) 2010, PostgreSQL Global Development Group
7-
*$PostgreSQL: pgsql/contrib/pg_upgrade/check.c,v 1.11 2010/07/06 19:18:55 momjian Exp $
7+
*$PostgreSQL: pgsql/contrib/pg_upgrade/check.c,v 1.12 2010/07/13 15:56:53 momjian Exp $
88
*/
99

1010
#include"pg_upgrade.h"
@@ -152,9 +152,9 @@ issue_warnings(migratorContext *ctx, char *sequence_script_file_name)
152152
{
153153
prep_status(ctx,"Adjusting sequences");
154154
exec_prog(ctx, true,
155-
SYSTEMQUOTE"\"%s/psql\" --set ON_ERROR_STOP=on--port %d"
156-
"--username \"%s\" -f \"%s\" --dbname template1 >>\"%s\""
157-
SYSTEMQUOTE,
155+
SYSTEMQUOTE"\"%s/psql\" --set ON_ERROR_STOP=on "
156+
"--no-psqlrc --port %d --username\"%s\""
157+
"-f \"%s\" --dbname template1 >> \"%s\""SYSTEMQUOTE,
158158
ctx->new.bindir,ctx->new.port,ctx->user,
159159
sequence_script_file_name,ctx->logfile);
160160
unlink(sequence_script_file_name);

‎contrib/pg_upgrade/pg_upgrade.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*main source file
55
*
66
*Copyright (c) 2010, PostgreSQL Global Development Group
7-
*$PostgreSQL: pgsql/contrib/pg_upgrade/pg_upgrade.c,v 1.10 2010/07/06 19:18:55 momjian Exp $
7+
*$PostgreSQL: pgsql/contrib/pg_upgrade/pg_upgrade.c,v 1.11 2010/07/13 15:56:53 momjian Exp $
88
*/
99

1010
#include"pg_upgrade.h"
@@ -202,9 +202,10 @@ prepare_new_databases(migratorContext *ctx)
202202
*/
203203
prep_status(ctx,"Creating databases in the new cluster");
204204
exec_prog(ctx, true,
205-
SYSTEMQUOTE"\"%s/psql\" --port %d --username \"%s\" "
206-
"--set ON_ERROR_STOP=on -f \"%s/%s\" --dbname template1 >> \"%s\""
207-
SYSTEMQUOTE,
205+
SYSTEMQUOTE"\"%s/psql\" --set ON_ERROR_STOP=on "
206+
/* --no-psqlrc prevents AUTOCOMMIT=off */
207+
"--no-psqlrc --port %d --username \"%s\" "
208+
"-f \"%s/%s\" --dbname template1 >> \"%s\""SYSTEMQUOTE,
208209
ctx->new.bindir,ctx->new.port,ctx->user,ctx->cwd,
209210
GLOBALS_DUMP_FILE,ctx->logfile);
210211
check_ok(ctx);
@@ -225,9 +226,9 @@ create_new_objects(migratorContext *ctx)
225226

226227
prep_status(ctx,"Restoring database schema to new cluster");
227228
exec_prog(ctx, true,
228-
SYSTEMQUOTE"\"%s/psql\" --port %d --username \"%s\" "
229-
"--set ON_ERROR_STOP=on -f \"%s/%s\" --dbname template1 >>\"%s\""
230-
SYSTEMQUOTE,
229+
SYSTEMQUOTE"\"%s/psql\" --set ON_ERROR_STOP=on "
230+
"--no-psqlrc --port %d --username\"%s\""
231+
"-f \"%s/%s\" --dbname template1 >> \"%s\""SYSTEMQUOTE,
231232
ctx->new.bindir,ctx->new.port,ctx->user,ctx->cwd,
232233
DB_DUMP_FILE,ctx->logfile);
233234
check_ok(ctx);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp