From fa463c7562ce27423f15de106617d7d6432212b3 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sat, 24 Nov 2007 17:45:32 +0000 Subject: [PATCH] If pg_dump drops a schema, make sure 'search_path' it SET the next time it is needed --- basically don't remember the previous 'search_path' after a drop schema because it might have failed but be created later. --- src/bin/pg_dump/pg_backup_archiver.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 149764e62b..ec38549d2c 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -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(""); + } } } } -- 2.39.5