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 c58ce6aff3a9e8f6edbf1278461d22cc63b362a0..d6f466d87883369feb08d745bace154bf76d1b98 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -6242,6 +6242,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 7873d3f3572657765ac7fa58bf6ea6745fda2110..27f72e75bd31df09c2675162c7f8ffbd99de419d 100644 (file)
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@ -257,6 +257,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 80c3fa89e491b535eafafcabdbd02b48d48e3bf4..45e140f74c7f9a121e884c1217721e6d45486956 100644 (file)
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -884,6 +884,7 @@ repairViewRuleMultiLoop(DumpableObject *viewobj,
 {
    TableInfo  *viewinfo = (TableInfo *) viewobj;
    RuleInfo   *ruleinfo = (RuleInfo *) ruleobj;
+   int         i;
 
    /* remove view's dependency on rule */
    removeObjectDependency(viewobj, ruleobj->dumpId);
@@ -901,6 +902,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);
 }
 
 /*