--- ../postgresql/src/bin/pg_dump/pg_dump.c 2015-01-19 19:03:45.897706879 +0100 +++ src/bin/pg_dump/pg_dump.c 2015-01-20 11:22:01.144794489 +0100 @@ -209,6 +209,7 @@ static void getDomainConstraints(Archive *fout, TypeInfo *tyinfo); static void getTableData(DumpOptions *dopt, TableInfo *tblinfo, int numTables, bool oids); +static bool hasExtensionMember(TableInfo *tblinfo, int numTables); static void makeTableDataInfo(DumpOptions *dopt, TableInfo *tbinfo, bool oids); static void buildMatViewRefreshDependencies(Archive *fout); static void getTableDataFKConstraints(void); @@ -730,9 +731,20 @@ if (!dopt.schemaOnly) { + bool has_ext_member; + getTableData(&dopt, tblinfo, numTables, dopt.oids); + + /* Search if there's dumpable table's members in an extension */ + has_ext_member = hasExtensionMember(tblinfo, numTables); + buildMatViewRefreshDependencies(fout); - if (dopt.dataOnly) + /* + * Get FK constraints even with schema+data if extension's + * members have FK because in this case tables need to be + * dump-ordered too. + */ + if (dopt.dataOnly || has_ext_member) getTableDataFKConstraints(); } @@ -1852,6 +1864,26 @@ } /* + * hasExtensionMember - + * return true when on of the dumpable object + * is an extension members + */ +static bool +hasExtensionMember(TableInfo *tblinfo, int numTables) +{ + int i; + + for (i = 0; i < numTables; i++) + { + if (tblinfo[i].dobj.ext_member) + return true; + } + + return false; +} + + +/* * Make a dumpable object for the data of this specific table * * Note: we make a TableDataInfo if and only if we are going to dump the @@ -2026,10 +2058,12 @@ * getTableDataFKConstraints - * add dump-order dependencies reflecting foreign key constraints * - * This code is executed only in a data-only dump --- in schema+data dumps - * we handle foreign key issues by not creating the FK constraints until - * after the data is loaded. In a data-only dump, however, we want to - * order the table data objects in such a way that a table's referenced + * This code is executed only in a data-only dump or when there is extension's + * member -- in schema+data dumps we handle foreign key issues by not creating + * the FK constraints until after the data is loaded. In a data-only dump or + * when there is an extension member to dump (schema dumps do not concern + * extension's objects, they are created during the CREATE EXTENSION), we want + * to order the table data objects in such a way that a table's referenced * tables are restored first. (In the presence of circular references or * self-references this may be impossible; we'll detect and complain about * that during the dependency sorting step.) @@ -2930,9 +2964,14 @@ PQExpBuffer delqry; const char *cmd; + /* Policy is SCHEMA only */ if (dopt->dataOnly) return; + /* CREATE EXTENSION should take care of that */ + if ((tbinfo != NULL) && tbinfo->dobj.ext_member) + return; + /* * If polname is NULL, then this record is just indicating that ROW * LEVEL SECURITY is enabled for the table. Dump as ALTER TABLE @@ -7884,6 +7923,10 @@ if (dopt->dataOnly) return; + /* CREATE EXTENSION should take care of that */ + if ((tbinfo != NULL) && tbinfo->dobj.ext_member) + return; + /* Search for comments associated with relation, using table */ ncomments = findComments(fout, tbinfo->dobj.catId.tableoid, @@ -13138,6 +13181,10 @@ if (dopt->dataOnly) return; + /* CREATE EXTENSION should take care of that */ + if ((tbinfo != NULL) && tbinfo->dobj.ext_member) + return; + /* Search for comments associated with relation, using table */ nlabels = findSecLabels(fout, tbinfo->dobj.catId.tableoid, @@ -13345,7 +13392,7 @@ static void dumpTable(Archive *fout, DumpOptions *dopt, TableInfo *tbinfo) { - if (tbinfo->dobj.dump && !dopt->dataOnly) + if (tbinfo->dobj.dump && !dopt->dataOnly && !tbinfo->dobj.ext_member) { char *namecopy; @@ -13483,6 +13530,10 @@ int j, k; + /* CREATE EXTENSION should take care of that */ + if ((tbinfo != NULL) && tbinfo->dobj.ext_member) + return; + /* Make sure we are in proper schema */ selectSourceSchema(fout, tbinfo->dobj.namespace->dobj.name); @@ -14117,6 +14168,10 @@ if (!tbinfo->dobj.dump || dopt->dataOnly) return; + /* CREATE EXTENSION should take care of that */ + if ((tbinfo != NULL) && tbinfo->dobj.ext_member) + return; + /* Skip if not "separate"; it was dumped in the table's definition */ if (!adinfo->separate) return; @@ -14204,6 +14259,10 @@ if (dopt->dataOnly) return; + /* CREATE EXTENSION should take care of that */ + if ((tbinfo != NULL) && tbinfo->dobj.ext_member) + return; + q = createPQExpBuffer(); delq = createPQExpBuffer(); labelq = createPQExpBuffer(); @@ -14293,6 +14352,10 @@ if (!coninfo->dobj.dump || dopt->dataOnly) return; + /* CREATE EXTENSION should take care of that */ + if ((tbinfo != NULL) && tbinfo->dobj.ext_member) + return; + q = createPQExpBuffer(); delq = createPQExpBuffer(); @@ -14517,7 +14580,13 @@ dumpTableConstraintComment(Archive *fout, DumpOptions *dopt, ConstraintInfo *coninfo) { TableInfo *tbinfo = coninfo->contable; - PQExpBuffer labelq = createPQExpBuffer(); + PQExpBuffer labelq; + + /* CREATE EXTENSION should take care of that */ + if ((tbinfo != NULL) && tbinfo->dobj.ext_member) + return; + + labelq = createPQExpBuffer(); appendPQExpBuffer(labelq, "CONSTRAINT %s ", fmtId(coninfo->dobj.name)); @@ -14594,9 +14663,17 @@ char bufm[100], bufx[100]; bool cycled; - PQExpBuffer query = createPQExpBuffer(); - PQExpBuffer delqry = createPQExpBuffer(); - PQExpBuffer labelq = createPQExpBuffer(); + PQExpBuffer query; + PQExpBuffer delqry; + PQExpBuffer labelq; + + /* CREATE EXTENSION should take care of that */ + if ((tbinfo != NULL) && tbinfo->dobj.ext_member) + return; + + query = createPQExpBuffer(); + delqry = createPQExpBuffer(); + labelq = createPQExpBuffer(); /* Make sure we are in proper schema */ selectSourceSchema(fout, tbinfo->dobj.namespace->dobj.name); @@ -14861,6 +14938,10 @@ if (dopt->dataOnly) return; + /* CREATE EXTENSION should take care of that */ + if ((tbinfo != NULL) && tbinfo->dobj.ext_member) + return; + query = createPQExpBuffer(); delqry = createPQExpBuffer(); labelq = createPQExpBuffer(); @@ -15137,6 +15218,10 @@ if (!rinfo->dobj.dump || dopt->dataOnly) return; + /* CREATE EXTENSION should take care of that */ + if ((tbinfo != NULL) && tbinfo->dobj.ext_member) + return; + /* * If it is an ON SELECT rule that is created implicitly by CREATE VIEW, * we do not want to dump it as a separate object. @@ -15427,6 +15512,9 @@ if (dumpobj) { + /* Mark member table as dumpable */ + configtbl->dobj.dump = true; + /* * Note: config tables are dumped without OIDs regardless * of the --oids setting. This is because row filtering