Fix pg_restore to process BLOB COMMENT entries correctly; they aren't

tglsfdc · tglsfdc · commit c76cb771053c · 2006-05-24T21:20:11.000Z
really tables and shouldn't get DISABLE TRIGGER processing.  Per bug
#2452 from Robert Treat.
diff --git 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.128 2006/05/22 11:21:54 petere Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.129 2006/05/24 21:20:11 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -312,9 +312,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");
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.128 2006/05/22 11:21:54 petere Exp $`
	`18`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.129 2006/05/24 21:20:11 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`@@ -312,9 +312,10 @@ RestoreArchive(Archive AHX, RestoreOptions ropt)`
`312`	`312`
`313`	`313`	`_printTocEntry(AH, te, ropt, true, false);`
`314`	`314`
`315`		`- if (strcmp(te->desc, "BLOBS") == 0)`
	`315`	`+ if (strcmp(te->desc, "BLOBS") == 0 \|\|`
	`316`	`+ strcmp(te->desc, "BLOB COMMENTS") == 0)`
`316`	`317`	`{`
`317`		`- ahlog(AH, 1, "restoring large object data\n");`
	`318`	`+ ahlog(AH, 1, "restoring %s\n", te->desc);`
`318`	`319`
`319`	`320`	`_selectOutputSchema(AH, "pg_catalog");`
`320`	`321`