Commit 1cf13e6f authored by Tom Lane's avatar Tom Lane

IMHO, --single-transaction should wrap *all* the commands in BEGIN/COMMIT,

not just some of them.
parent d537e0b4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.123 2006/02/12 06:11:50 momjian Exp $ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.124 2006/02/13 21:30:19 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -213,6 +213,9 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt) ...@@ -213,6 +213,9 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
if (AH->public.verbose) if (AH->public.verbose)
dumpTimestamp(AH, "Started on", AH->createDate); dumpTimestamp(AH, "Started on", AH->createDate);
if (ropt->single_txn)
ahprintf(AH, "BEGIN;\n\n");
/* /*
* Establish important parameter values right away. * Establish important parameter values right away.
*/ */
...@@ -220,9 +223,6 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt) ...@@ -220,9 +223,6 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
AH->stage = STAGE_PROCESSING; AH->stage = STAGE_PROCESSING;
if (ropt->single_txn)
ahprintf(AH, "BEGIN;\n\n");
/* /*
* Drop the items at the start, in reverse order * Drop the items at the start, in reverse order
*/ */
...@@ -376,7 +376,7 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt) ...@@ -376,7 +376,7 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
} }
} }
if (ropt->single_txn) if (ropt->single_txn)
ahprintf(AH, "COMMIT;\n\n"); ahprintf(AH, "COMMIT;\n\n");
if (AH->public.verbose) if (AH->public.verbose)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment