database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-21 16:02:15 +03:00
Code Activity

Place statement timeout more appropriately, per gripe from Tom.

Browse Source
This commit is contained in:
Andrew Dunstan
2008-05-04 03:46:08 +00:00
parent 17a56c0b55
commit c2c9fbef94
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/pg_dump/pg_backup_archiver.c
View File

@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.155 2008/05/03 23:32:32 adunstan Exp $ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.156 2008/05/04 03:46:08 adunstan Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -219,11 +219,6 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
ahprintf(AH, "BEGIN;\n\n"); ahprintf(AH, "BEGIN;\n\n");
} }
/*
* Disable statement_timeout in archive for pg_restore/psql
*/
ahprintf(AH, "SET statement_timeout = 0;\n");
/* /*
* Establish important parameter values right away. * Establish important parameter values right away.
*/ */
@ -2140,6 +2135,9 @@ _tocEntryRequired(TocEntry *te, RestoreOptions *ropt, bool include_acls)
static void static void
_doSetFixedOutputState(ArchiveHandle *AH) _doSetFixedOutputState(ArchiveHandle *AH)
{ {
/* Disable statement_timeout in archive for pg_restore/psql */
ahprintf(AH, "SET statement_timeout = 0;\n")
/* Select the correct character set encoding */ /* Select the correct character set encoding */
ahprintf(AH, "SET client_encoding = '%s';\n", ahprintf(AH, "SET client_encoding = '%s';\n",
pg_encoding_to_char(AH->public.encoding)); pg_encoding_to_char(AH->public.encoding));