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

If pg_dump drops a schema, make sure 'search_path' it SET the next time

Browse Source 
it is needed --- basically don't remember the previous 'search_path'
after a drop schema because it might have failed but be created later.
This commit is contained in:
Bruce Momjian 2007-11-24 17:45:32 +00:00
parent 8a52d0c94d
commit 7ebbc815d9
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.149 2007/11/15 21:14:41 momjian Exp $
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.150 2007/11/24 17:45:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -245,6 +245,21 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
_selectOutputSchema(AH, te->namespace);
/* Drop it */
ahprintf(AH, "%s", te->dropStmt);
if (strcmp(te->desc, "SCHEMA") == 0)
{
/*
* If we dropped a schema, we know we are going to be
* creating one later so don't remember the current one
* so we try later. The previous 'search_path' setting
* might have failed because the schema didn't exist
* (and now it certainly doesn't exist), so force
* search_path to be set as part of the next operation
* and it might succeed.
*/
if (AH->currSchema)
free(AH->currSchema);
AH->currSchema = strdup("");
}
}
}
}