In pg_dump, ensure that view triggers are processed after view rules.

If a view is split into CREATE TABLE + CREATE RULE to break a circular
dependency, then any triggers on the view must be dumped/reloaded after
the CREATE RULE; else the backend may reject the CREATE TRIGGER because
it's the wrong type of trigger for a plain table.  This works all right
in plain dump/restore because of pg_dump's sorting heuristic that places
triggers after rules.  However, when using parallel restore, the ordering
must be enforced by a dependency --- and we didn't have one.

Fixing this is a mere matter of adding an addObjectDependency() call,
except that we need to be able to find all the triggers belonging to the
view relation, and there was no easy way to do that.  Add fields to
pg_dump's TableInfo struct to remember where the associated TriggerInfo
struct(s) are.

Per bug report from Dennis Kögel.  The failure can be exhibited at least
as far back as 9.1, so back-patch to all supported branches.

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 9ff7f4ca70e86f34d87b3869b29b1901d7304503..53d61022230873c0552bd56873374f9877bc5e45 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -5378,6 +5378,9 @@ getTriggers(Archive *fout, TableInfo tblinfo[], int numTables)
 
        tginfo = (TriggerInfo *) pg_malloc(ntups * sizeof(TriggerInfo));
 
+       tbinfo->numTriggers = ntups;
+       tbinfo->triggers = tginfo;
+
        for (j = 0; j < ntups; j++)
        {
            tginfo[j].dobj.objType = DO_TRIGGER;

diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h
index 1ca702d1e0ccbac0044301ac2e31ce4da7247b4d..c492ae9a96ad6d192c7fcfa3d0f7c2d94c07c13f 100644 (file)
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@ -291,6 +291,8 @@ typedef struct _tableInfo
    int         numParents;     /* number of (immediate) parent tables */
    struct _tableInfo **parents;    /* TableInfos of immediate parents */
    struct _tableDataInfo *dataObj;     /* TableDataInfo, if dumping its data */
+   int         numTriggers;    /* number of triggers for table */
+   struct _triggerInfo *triggers;      /* array of TriggerInfo structs */
 } TableInfo;
 
 typedef struct _attrDefInfo

diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index dbdc04889c86babb3231c25567c3122030381dc2..467282cd68cfb1a35128f538673ac2e77e8c206b 100644 (file)
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -760,6 +760,7 @@ repairViewRuleMultiLoop(DumpableObject *viewobj,
 {
    TableInfo  *viewinfo = (TableInfo *) viewobj;
    RuleInfo   *ruleinfo = (RuleInfo *) ruleobj;
+   int         i;
 
    /* remove view's dependency on rule */
    removeObjectDependency(viewobj, ruleobj->dumpId);
@@ -777,6 +778,9 @@ repairViewRuleMultiLoop(DumpableObject *viewobj,
    addObjectDependency(ruleobj, viewobj->dumpId);
    /* now that rule is separate, it must be post-data */
    addObjectDependency(ruleobj, postDataBoundId);
+   /* also, any triggers on the view must be dumped after the rule */
+   for (i = 0; i < viewinfo->numTriggers; i++)
+       addObjectDependency(&(viewinfo->triggers[i].dobj), ruleobj->dumpId);
 }
 
 /*