Improve pg_dump/pg_restore --create --if-exists logic.

Teach it not to complain if the dropStmt attached to an archive entry
is actually spelled CREATE OR REPLACE VIEW, since that will happen due to
an upcoming bug fix.  Also, if it doesn't recognize a dropStmt, have it
print a WARNING and then emit the dropStmt unmodified.  That seems like a
much saner behavior than Assert'ing or dumping core due to a null-pointer
dereference, which is what would happen before :-(.

Back-patch to 9.4 where this option was introduced.

Discussion: <19092.1479325184@sss.pgh.pa.us>

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 1fc7f10b2d29def4c6e0fed7dbc747887d791630..b89bd99e49f843409ba5ef93bfee31ae44abf58a 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -521,7 +521,6 @@ RestoreArchive(Archive *AHX)
                         * knows how to do it, without depending on
                         * te->dropStmt; use that.  For other objects we need
                         * to parse the command.
-                        *
                         */
                        if (strncmp(te->desc, "BLOB", 4) == 0)
                        {
@@ -529,10 +528,8 @@ RestoreArchive(Archive *AHX)
                        }
                        else
                        {
-                           char        buffer[40];
-                           char       *mark;
                            char       *dropStmt = pg_strdup(te->dropStmt);
-                           char       *dropStmtPtr = dropStmt;
+                           char       *dropStmtOrig = dropStmt;
                            PQExpBuffer ftStmt = createPQExpBuffer();
 
                            /*
@@ -549,18 +546,28 @@ RestoreArchive(Archive *AHX)
                            /*
                             * ALTER TABLE..ALTER COLUMN..DROP DEFAULT does
                             * not support the IF EXISTS clause, and therefore
-                            * we simply emit the original command for such
-                            * objects. For other objects, we need to extract
-                            * the first part of the DROP which includes the
-                            * object type. Most of the time this matches
+                            * we simply emit the original command for DEFAULT
+                            * objects (modulo the adjustment made above).
+                            *
+                            * If we used CREATE OR REPLACE VIEW as a means of
+                            * quasi-dropping an ON SELECT rule, that should
+                            * be emitted unchanged as well.
+                            *
+                            * For other object types, we need to extract the
+                            * first part of the DROP which includes the
+                            * object type.  Most of the time this matches
                             * te->desc, so search for that; however for the
                             * different kinds of CONSTRAINTs, we know to
                             * search for hardcoded "DROP CONSTRAINT" instead.
                             */
-                           if (strcmp(te->desc, "DEFAULT") == 0)
+                           if (strcmp(te->desc, "DEFAULT") == 0 ||
+                               strncmp(dropStmt, "CREATE OR REPLACE VIEW", 22) == 0)
                                appendPQExpBufferStr(ftStmt, dropStmt);
                            else
                            {
+                               char        buffer[40];
+                               char       *mark;
+
                                if (strcmp(te->desc, "CONSTRAINT") == 0 ||
                                 strcmp(te->desc, "CHECK CONSTRAINT") == 0 ||
                                    strcmp(te->desc, "FK CONSTRAINT") == 0)
@@ -570,19 +577,28 @@ RestoreArchive(Archive *AHX)
                                             te->desc);
 
                                mark = strstr(dropStmt, buffer);
-                               Assert(mark != NULL);
 
-                               *mark = '\0';
-                               appendPQExpBuffer(ftStmt, "%s%s IF EXISTS%s",
-                                                 dropStmt, buffer,
-                                                 mark + strlen(buffer));
+                               if (mark)
+                               {
+                                   *mark = '\0';
+                                   appendPQExpBuffer(ftStmt, "%s%s IF EXISTS%s",
+                                                     dropStmt, buffer,
+                                                     mark + strlen(buffer));
+                               }
+                               else
+                               {
+                                   /* complain and emit unmodified command */
+                                   write_msg(modulename,
+                                             "WARNING: could not find where to insert IF EXISTS in statement \"%s\"\n",
+                                             dropStmtOrig);
+                                   appendPQExpBufferStr(ftStmt, dropStmt);
+                               }
                            }
 
                            ahprintf(AH, "%s", ftStmt->data);
 
                            destroyPQExpBuffer(ftStmt);
-
-                           pg_free(dropStmtPtr);
+                           pg_free(dropStmtOrig);
                        }
                    }
                }