summaryrefslogtreecommitdiff
path: root/src/bin/pg_dump/pg_backup_archiver.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2006-02-05 20:58:57 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2006-02-05 20:58:57 +0000
commit7d41ef1a92ff07a44930cb2dbf67d86850081b38 (patch)
treebdd7b20d6da2944c4db252e41875a81455435ce2 /src/bin/pg_dump/pg_backup_archiver.c
parentc75c372c58dd994b9da0cf37648ad092fb450bd8 (diff)
Fix pg_restore to properly discard COPY data when trying to continue
after an error in a COPY statement. Formerly it thought the COPY data was SQL commands, and got quite confused. Stephen Frost
Diffstat (limited to 'src/bin/pg_dump/pg_backup_archiver.c')
-rw-r--r--src/bin/pg_dump/pg_backup_archiver.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index d62c542206a..61b0dee4cbf 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -15,7 +15,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.117.2.1 2005/11/22 18:23:26 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.117.2.2 2006/02/05 20:58:57 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -330,10 +330,15 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
* with libpq.
*/
if (te->copyStmt && strlen(te->copyStmt) > 0)
+ {
ahprintf(AH, "%s", te->copyStmt);
+ AH->writingCopyData = true;
+ }
(*AH->PrintTocDataPtr) (AH, te, ropt);
+ AH->writingCopyData = false;
+
_enableTriggersIfNecessary(AH, te, ropt);
}
}