-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Tue, 11 Mar 2008 10:46:23 -0700
"Joshua D. Drake" <[EMAIL PROTECTED]> wrote:

And the -c version :) (thanks bruce)

Joshua D. Drake

- -- 
The PostgreSQL Company since 1997: http://www.commandprompt.com/ 
PostgreSQL Community Conference: http://www.postgresqlconference.org/
Donate to the PostgreSQL Project: http://www.postgresql.org/about/donate
      PostgreSQL political pundit | Mocker of Dolphins

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFH1spfATb/zqfZUUQRAv2EAJ92/8EBxBbqLDlOX5wUYdN3ElG5OQCghZ2Z
tUIrN/MYVgP6rc4QXONDrFg=
=2oJ5
-----END PGP SIGNATURE-----
? pg_dump_restore.diff
Index: pg_backup_archiver.c
===================================================================
RCS file: /projects/cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v
retrieving revision 1.152
diff -c -r1.152 pg_backup_archiver.c
*** pg_backup_archiver.c	14 Jan 2008 19:27:41 -0000	1.152
--- pg_backup_archiver.c	11 Mar 2008 18:05:55 -0000
***************
*** 218,224 ****
  		else
  			ahprintf(AH, "BEGIN;\n\n");
  	}
! 
  	/*
  	 * Establish important parameter values right away.
  	 */
--- 218,229 ----
  		else
  			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.
  	 */
Index: pg_dump.c
===================================================================
RCS file: /projects/cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v
retrieving revision 1.482
diff -c -r1.482 pg_dump.c
*** pg_dump.c	30 Jan 2008 18:35:55 -0000	1.482
--- pg_dump.c	11 Mar 2008 18:05:58 -0000
***************
*** 566,578 ****
  	if (g_fout->remoteVersion >= 80300)
  		do_sql_command(g_conn, "SET synchronize_seqscans TO off");
  
  	/*
  	 * Start serializable transaction to dump consistent data.
  	 */
  	do_sql_command(g_conn, "BEGIN");
  
  	do_sql_command(g_conn, "SET TRANSACTION ISOLATION LEVEL SERIALIZABLE");
! 
  	/* Select the appropriate subquery to convert user IDs to names */
  	if (g_fout->remoteVersion >= 80100)
  		username_subquery = "SELECT rolname FROM pg_catalog.pg_roles WHERE oid =";
--- 566,583 ----
  	if (g_fout->remoteVersion >= 80300)
  		do_sql_command(g_conn, "SET synchronize_seqscans TO off");
  
+         /*
+          * Set statement timeout to zero. 
+          */
+         do_sql_command(g_conn, "SET statement_timeout = 0");
+          
  	/*
  	 * Start serializable transaction to dump consistent data.
  	 */
  	do_sql_command(g_conn, "BEGIN");
  
  	do_sql_command(g_conn, "SET TRANSACTION ISOLATION LEVEL SERIALIZABLE");
!        
  	/* Select the appropriate subquery to convert user IDs to names */
  	if (g_fout->remoteVersion >= 80100)
  		username_subquery = "SELECT rolname FROM pg_catalog.pg_roles WHERE oid =";
-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

Reply via email to