mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tom Lane 2003-03-09 19:38:52 +00:00
parent dd04e958c8
commit b9e8ffcd5d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/pg_dump/pg_backup_archiver.c
View File

@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.68 2003/02/14 19:40:42 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.69 2003/03/09 19:38:52 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -294,7 +294,8 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
* Maybe we can't do BLOBS, so check if this node is * Maybe we can't do BLOBS, so check if this node is
* for BLOBS * 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"); ahprintf(AH, "--\n-- SKIPPED \n--\n\n");
@ -446,6 +447,10 @@ _disableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te, RestoreOptions *rop
if (!ropt->dataOnly || !ropt->disable_triggers) if (!ropt->dataOnly || !ropt->disable_triggers)
return; return;
/* Don't do it for the BLOBS TocEntry, either */
if (te && strcmp(te->desc, "BLOBS") == 0)
return;
oldUser = strdup(AH->currUser); oldUser = strdup(AH->currUser);
oldSchema = strdup(AH->currSchema); oldSchema = strdup(AH->currSchema);
@ -509,6 +514,10 @@ _enableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt
if (!ropt->dataOnly || !ropt->disable_triggers) if (!ropt->dataOnly || !ropt->disable_triggers)
return; return;
/* Don't do it for the BLOBS TocEntry, either */
if (te && strcmp(te->desc, "BLOBS") == 0)
return;
oldUser = strdup(AH->currUser); oldUser = strdup(AH->currUser);
oldSchema = strdup(AH->currSchema); oldSchema = strdup(AH->currSchema);