summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2006-05-24 21:20:24 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2006-05-24 21:20:24 +0000
commitcad1ff1037523c3c20ed63ee1ce0894167498037 (patch)
tree4d383efca7f359c838950a6ff4aa81acd490c266
parent8a507aeaeb5465f5e5a609b64a486d9d38e439b2 (diff)
Fix pg_restore to process BLOB COMMENT entries correctly; they aren't
really tables and shouldn't get DISABLE TRIGGER processing. Per bug #2452 from Robert Treat.
-rw-r--r--src/bin/pg_dump/pg_backup_archiver.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index aa698e73726..1abd3b19912 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.3 2006/04/12 22:19:01 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.117.2.4 2006/05/24 21:20:24 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -300,9 +300,10 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
_printTocEntry(AH, te, ropt, true, false);
- if (strcmp(te->desc, "BLOBS") == 0)
+ if (strcmp(te->desc, "BLOBS") == 0 ||
+ strcmp(te->desc, "BLOB COMMENTS") == 0)
{
- ahlog(AH, 1, "restoring large object data\n");
+ ahlog(AH, 1, "restoring %s\n", te->desc);
_selectOutputSchema(AH, "pg_catalog");