From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 9 Mar 2003 19:38:59 +0000 (+0000)
Subject: pg_restore failed to restore blobs if -X disable-triggers is specified.
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=fd88057ac1c008a9723b088386028802b7d3ffcb;p=users%2Fbernd%2Fpostgres.git

pg_restore failed to restore blobs if -X disable-triggers is specified.
---

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 8a6ec311fc..8941961d17 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -293,7 +293,8 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
 					 * Maybe we can't do BLOBS, so check if this node is
 					 * for BLOBS
 					 */
-					if ((strcmp(te->desc, "BLOBS") == 0) && !_canRestoreBlobs(AH))
+					if ((strcmp(te->desc, "BLOBS") == 0) &&
+						!_canRestoreBlobs(AH))
 					{
 						ahprintf(AH, "--\n-- SKIPPED \n--\n\n");
 
@@ -445,6 +446,10 @@ _disableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te, RestoreOptions *rop
 	if (!ropt->dataOnly || !ropt->disable_triggers)
 		return;
 
+	/* Don't do it for the BLOBS TocEntry, either */
+	if (te && strcmp(te->desc, "BLOBS") == 0)
+		return;
+
 	oldUser = strdup(AH->currUser);
 	oldSchema = strdup(AH->currSchema);
 
@@ -508,6 +513,10 @@ _enableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt
 	if (!ropt->dataOnly || !ropt->disable_triggers)
 		return;
 
+	/* Don't do it for the BLOBS TocEntry, either */
+	if (te && strcmp(te->desc, "BLOBS") == 0)
+		return;
+
 	oldUser = strdup(AH->currUser);
 	oldSchema = strdup(AH->currSchema);