From 96a334e2411794bdc4648475be286f159daa2484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Yhuel?= Date: Wed, 31 Aug 2022 15:57:39 +0200 Subject: [PATCH 2/2] pg_dump: fix up d8c05aff --- src/bin/pg_dump/pg_backup_archiver.c | 3 ++- src/bin/pg_dump/pg_dump.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 233198afc0..bb5031105e 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -585,7 +585,8 @@ RestoreArchive(Archive *AHX) */ if (strcmp(te->desc, "DEFAULT") == 0 || strcmp(te->desc, "DATABASE PROPERTIES") == 0 || - strncmp(dropStmt, "CREATE OR REPLACE VIEW", 22) == 0) + ( strncmp(dropStmt, "CREATE SCHEMA IF NOT EXISTS", 27) == 0 && + strstr(dropStmt+29, "CREATE OR REPLACE VIEW") )) appendPQExpBufferStr(ftStmt, dropStmt); else { diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index d25709ad5f..8820984d9e 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -17274,6 +17274,7 @@ dumpRule(Archive *fout, const RuleInfo *rinfo) char *qtabname; PGresult *res; char *tag; + char *qnspname; /* Do nothing in data-only dump */ if (dopt->dataOnly) @@ -17374,6 +17375,9 @@ dumpRule(Archive *fout, const RuleInfo *rinfo) */ PQExpBuffer result; + qnspname = pg_strdup(fmtId(tbinfo->dobj.namespace->dobj.name)); + appendPQExpBuffer(delcmd, "CREATE SCHEMA IF NOT EXISTS %s;\n", qnspname); + free(qnspname); appendPQExpBuffer(delcmd, "CREATE OR REPLACE VIEW %s", fmtQualifiedDumpable(tbinfo)); result = createDummyViewAsClause(fout, tbinfo); -- 2.30.2