|
15 | 15 | * |
16 | 16 | * |
17 | 17 | * IDENTIFICATION |
18 | | - *$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.68 2003/02/14 19:40:42 momjian Exp $ |
| 18 | + *$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.69 2003/03/09 19:38:52 tgl Exp $ |
19 | 19 | * |
20 | 20 | *------------------------------------------------------------------------- |
21 | 21 | */ |
@@ -294,7 +294,8 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt) |
294 | 294 | * Maybe we can't do BLOBS, so check if this node is |
295 | 295 | * for BLOBS |
296 | 296 | */ |
297 | | -if ((strcmp(te->desc,"BLOBS")==0)&& !_canRestoreBlobs(AH)) |
| 297 | +if ((strcmp(te->desc,"BLOBS")==0)&& |
| 298 | +!_canRestoreBlobs(AH)) |
298 | 299 | { |
299 | 300 | ahprintf(AH,"--\n-- SKIPPED \n--\n\n"); |
300 | 301 |
|
@@ -446,6 +447,10 @@ _disableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te, RestoreOptions *rop |
446 | 447 | if (!ropt->dataOnly|| !ropt->disable_triggers) |
447 | 448 | return; |
448 | 449 |
|
| 450 | +/* Don't do it for the BLOBS TocEntry, either */ |
| 451 | +if (te&&strcmp(te->desc,"BLOBS")==0) |
| 452 | +return; |
| 453 | + |
449 | 454 | oldUser=strdup(AH->currUser); |
450 | 455 | oldSchema=strdup(AH->currSchema); |
451 | 456 |
|
@@ -509,6 +514,10 @@ _enableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt |
509 | 514 | if (!ropt->dataOnly|| !ropt->disable_triggers) |
510 | 515 | return; |
511 | 516 |
|
| 517 | +/* Don't do it for the BLOBS TocEntry, either */ |
| 518 | +if (te&&strcmp(te->desc,"BLOBS")==0) |
| 519 | +return; |
| 520 | + |
512 | 521 | oldUser=strdup(AH->currUser); |
513 | 522 | oldSchema=strdup(AH->currSchema); |
514 | 523 |
|
|