summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0ddeaba)
raw | patch | inline | side by side (parent: 0ddeaba)
| author | Tom Lane <tgl@sss.pgh.pa.us> | |
| Wed, 13 Jan 2016 23:55:27 +0000 (18:55 -0500) | ||
| committer | Tom Lane <tgl@sss.pgh.pa.us> | |
| Wed, 13 Jan 2016 23:55:27 +0000 (18:55 -0500) |
pg_dump's original approach to handling extension member objects was to
run around and clear (or set) their dump flags rather late in its data
collection process. Unfortunately, quite a lot of code expects those flags
to be valid before that; which was an entirely reasonable expectation
before we added extensions. In particular, this explains Karsten Hilbert's
recent report of pg_upgrade failing on a database in which an extension
has been installed into the pg_catalog schema. Its objects are initially
marked as not-to-be-dumped on the strength of their schema, and later we
change them to must-dump because we're doing a binary upgrade of their
extension; but we've already skipped essential tasks like making associated
DO_SHELL_TYPE objects.
To fix, collect extension membership data first, and incorporate it in the
initial setting of the dump flags, so that those are once again correct
from the get-go. This has the undesirable side effect of slightly
lengthening the time taken before pg_dump acquires table locks, but testing
suggests that the increase in that window is not very much.
Along the way, get rid of ugly special-case logic for deciding whether
to dump procedural languages, FDWs, and foreign servers; dump decisions
for those are now correct up-front, too.
In 9.3 and up, this also fixes erroneous logic about when to dump event
triggers (basically, they were *always* dumped before). In 9.5 and up,
transform objects had that problem too.
Since this problem came in with extensions, back-patch to all supported
versions.
run around and clear (or set) their dump flags rather late in its data
collection process. Unfortunately, quite a lot of code expects those flags
to be valid before that; which was an entirely reasonable expectation
before we added extensions. In particular, this explains Karsten Hilbert's
recent report of pg_upgrade failing on a database in which an extension
has been installed into the pg_catalog schema. Its objects are initially
marked as not-to-be-dumped on the strength of their schema, and later we
change them to must-dump because we're doing a binary upgrade of their
extension; but we've already skipped essential tasks like making associated
DO_SHELL_TYPE objects.
To fix, collect extension membership data first, and incorporate it in the
initial setting of the dump flags, so that those are once again correct
from the get-go. This has the undesirable side effect of slightly
lengthening the time taken before pg_dump acquires table locks, but testing
suggests that the increase in that window is not very much.
Along the way, get rid of ugly special-case logic for deciding whether
to dump procedural languages, FDWs, and foreign servers; dump decisions
for those are now correct up-front, too.
In 9.3 and up, this also fixes erroneous logic about when to dump event
triggers (basically, they were *always* dumped before). In 9.5 and up,
transform objects had that problem too.
Since this problem came in with extensions, back-patch to all supported
versions.
| src/bin/pg_dump/common.c | patch | blob | blame | history | |
| src/bin/pg_dump/pg_dump.c | patch | blob | blame | history | |
| src/bin/pg_dump/pg_dump.h | patch | blob | blame | history |
index 50993ac13ce85af6ac52592372fd5197729467b5..ffcb476a29e4c61825211d8b78e7bd39d221f668 100644 (file)
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
/*
* These variables are static to avoid the notational cruft of having to pass
- * them into findTableByOid() and friends. For each of these arrays, we
- * build a sorted-by-OID index array immediately after it's built, and then
- * we use binary search in findTableByOid() and friends. (qsort'ing the base
- * arrays themselves would be simpler, but it doesn't work because pg_dump.c
- * may have already established pointers between items.)
- */
-static TableInfo *tblinfo;
-static TypeInfo *typinfo;
-static FuncInfo *funinfo;
-static OprInfo *oprinfo;
-static NamespaceInfo *nspinfo;
-static int numTables;
-static int numTypes;
-static int numFuncs;
-static int numOperators;
-static int numCollations;
-static int numNamespaces;
+ * them into findTableByOid() and friends. For each of these arrays, we build
+ * a sorted-by-OID index array immediately after the objects are fetched,
+ * and then we use binary search in findTableByOid() and friends. (qsort'ing
+ * the object arrays themselves would be simpler, but it doesn't work because
+ * pg_dump.c may have already established pointers between items.)
+ */
static DumpableObject **tblinfoindex;
static DumpableObject **typinfoindex;
static DumpableObject **funinfoindex;
static DumpableObject **oprinfoindex;
static DumpableObject **collinfoindex;
static DumpableObject **nspinfoindex;
+static DumpableObject **extinfoindex;
+static int numTables;
+static int numTypes;
+static int numFuncs;
+static int numOperators;
+static int numCollations;
+static int numNamespaces;
+static int numExtensions;
+/* This is an array of object identities, not actual DumpableObjects */
+static ExtensionMemberId *extmembers;
+static int numextmembers;
static void flagInhTables(TableInfo *tbinfo, int numTables,
InhInfo *inhinfo, int numInherits);
static DumpableObject **buildIndexArray(void *objArray, int numObjs,
Size objSize);
static int DOCatalogIdCompare(const void *p1, const void *p2);
+static int ExtensionMemberIdCompare(const void *p1, const void *p2);
static void findParentsByOid(TableInfo *self,
InhInfo *inhinfo, int numInherits);
static int strInArray(const char *pattern, char **arr, int arr_size);
TableInfo *
getSchemaData(Archive *fout, int *numTablesPtr)
{
+ TableInfo *tblinfo;
+ TypeInfo *typinfo;
+ FuncInfo *funinfo;
+ OprInfo *oprinfo;
+ CollInfo *collinfo;
+ NamespaceInfo *nspinfo;
ExtensionInfo *extinfo;
InhInfo *inhinfo;
- CollInfo *collinfo;
- int numExtensions;
int numAggregates;
int numInherits;
int numRules;
int numDefaultACLs;
int numEventTriggers;
+ /*
+ * We must read extensions and extension membership info first, because
+ * extension membership needs to be consultable during decisions about
+ * whether other objects are to be dumped.
+ */
+ if (g_verbose)
+ write_msg(NULL, "reading extensions\n");
+ extinfo = getExtensions(fout, &numExtensions);
+ extinfoindex = buildIndexArray(extinfo, numExtensions, sizeof(ExtensionInfo));
+
+ if (g_verbose)
+ write_msg(NULL, "identifying extension members\n");
+ getExtensionMembership(fout, extinfo, numExtensions);
+
if (g_verbose)
write_msg(NULL, "reading schemas\n");
nspinfo = getNamespaces(fout, &numNamespaces);
/* Do this after we've built tblinfoindex */
getOwnedSeqs(fout, tblinfo, numTables);
- if (g_verbose)
- write_msg(NULL, "reading extensions\n");
- extinfo = getExtensions(fout, &numExtensions);
-
if (g_verbose)
write_msg(NULL, "reading user-defined functions\n");
funinfo = getFuncs(fout, &numFuncs);
write_msg(NULL, "reading event triggers\n");
getEventTriggers(fout, &numEventTriggers);
- /*
- * Identify extension member objects and mark them as not to be dumped.
- * This must happen after reading all objects that can be direct members
- * of extensions, but before we begin to process table subsidiary objects.
- */
+ /* Identify extension configuration tables that should be dumped */
if (g_verbose)
- write_msg(NULL, "finding extension members\n");
- getExtensionMembership(fout, extinfo, numExtensions);
+ write_msg(NULL, "finding extension tables\n");
+ processExtensionTables(fout, extinfo, numExtensions);
/* Link tables to parents, mark parents of target tables interesting */
if (g_verbose)
return (NamespaceInfo *) findObjectByOid(oid, nspinfoindex, numNamespaces);
}
+/*
+ * findExtensionByOid
+ * finds the entry (in extinfo) of the extension with the given oid
+ * returns NULL if not found
+ */
+ExtensionInfo *
+findExtensionByOid(Oid oid)
+{
+ return (ExtensionInfo *) findObjectByOid(oid, extinfoindex, numExtensions);
+}
+
+
+/*
+ * setExtensionMembership
+ * accept and save data about which objects belong to extensions
+ */
+void
+setExtensionMembership(ExtensionMemberId *extmems, int nextmems)
+{
+ /* Sort array in preparation for binary searches */
+ if (nextmems > 1)
+ qsort((void *) extmems, nextmems, sizeof(ExtensionMemberId),
+ ExtensionMemberIdCompare);
+ /* And save */
+ extmembers = extmems;
+ numextmembers = nextmems;
+}
+
+/*
+ * findOwningExtension
+ * return owning extension for specified catalog ID, or NULL if none
+ */
+ExtensionInfo *
+findOwningExtension(CatalogId catalogId)
+{
+ ExtensionMemberId *low;
+ ExtensionMemberId *high;
+
+ /*
+ * We could use bsearch() here, but the notational cruft of calling
+ * bsearch is nearly as bad as doing it ourselves; and the generalized
+ * bsearch function is noticeably slower as well.
+ */
+ if (numextmembers <= 0)
+ return NULL;
+ low = extmembers;
+ high = extmembers + (numextmembers - 1);
+ while (low <= high)
+ {
+ ExtensionMemberId *middle;
+ int difference;
+
+ middle = low + (high - low) / 2;
+ /* comparison must match ExtensionMemberIdCompare, below */
+ difference = oidcmp(middle->catId.oid, catalogId.oid);
+ if (difference == 0)
+ difference = oidcmp(middle->catId.tableoid, catalogId.tableoid);
+ if (difference == 0)
+ return middle->ext;
+ else if (difference < 0)
+ low = middle + 1;
+ else
+ high = middle - 1;
+ }
+ return NULL;
+}
+
+/*
+ * qsort comparator for ExtensionMemberIds
+ */
+static int
+ExtensionMemberIdCompare(const void *p1, const void *p2)
+{
+ const ExtensionMemberId *obj1 = (const ExtensionMemberId *) p1;
+ const ExtensionMemberId *obj2 = (const ExtensionMemberId *) p2;
+ int cmpval;
+
+ /*
+ * Compare OID first since it's usually unique, whereas there will only be
+ * a few distinct values of tableoid.
+ */
+ cmpval = oidcmp(obj1->catId.oid, obj2->catId.oid);
+ if (cmpval == 0)
+ cmpval = oidcmp(obj1->catId.tableoid, obj2->catId.tableoid);
+ return cmpval;
+}
+
/*
* findParentsByOid
index 03d15b8637454b4fa50ec59b43cac415183ed1d6..a553583c34e6c9747f2cf30591a2f66a5de95598 100644 (file)
destroyPQExpBuffer(query);
}
+/*
+ * checkExtensionMembership
+ * Determine whether object is an extension member, and if so,
+ * record an appropriate dependency and set the object's dump flag.
+ *
+ * It's important to call this for each object that could be an extension
+ * member. Generally, we integrate this with determining the object's
+ * to-be-dumped-ness, since extension membership overrides other rules for that.
+ *
+ * Returns true if object is an extension member, else false.
+ */
+static bool
+checkExtensionMembership(DumpableObject *dobj)
+{
+ ExtensionInfo *ext = findOwningExtension(dobj->catId);
+
+ if (ext == NULL)
+ return false;
+
+ dobj->ext_member = true;
+
+ /* Record dependency so that getDependencies needn't deal with that */
+ addObjectDependency(dobj, ext->dobj.dumpId);
+
+ /*
+ * Normally, mark the member object as not to be dumped. But in binary
+ * upgrades, we still dump the members individually, since the idea is to
+ * exactly reproduce the database contents rather than replace the
+ * extension contents with something different.
+ */
+ if (!binary_upgrade)
+ dobj->dump = false;
+ else
+ dobj->dump = ext->dobj.dump;
+
+ return true;
+}
+
/*
* selectDumpableNamespace: policy-setting subroutine
* Mark a namespace as to be dumped or not
static void
selectDumpableNamespace(NamespaceInfo *nsinfo)
{
+ if (checkExtensionMembership(&nsinfo->dobj))
+ return; /* extension membership overrides all else */
+
/*
* If specific tables are being dumped, do not dump any complete
* namespaces. If specific namespaces are being dumped, dump just those
static void
selectDumpableTable(TableInfo *tbinfo)
{
+ if (checkExtensionMembership(&tbinfo->dobj))
+ return; /* extension membership overrides all else */
+
/*
* If specific tables are being dumped, dump just those tables; else, dump
* according to the parent namespace's dump flag.
*/
}
+ if (checkExtensionMembership(&tyinfo->dobj))
+ return; /* extension membership overrides all else */
+
/* dump only types in dumpable namespaces */
if (!tyinfo->dobj.namespace->dobj.dump)
tyinfo->dobj.dump = false;
static void
selectDumpableDefaultACL(DefaultACLInfo *dinfo)
{
+ /* Default ACLs can't be extension members */
+
if (dinfo->dobj.namespace)
dinfo->dobj.dump = dinfo->dobj.namespace->dobj.dump;
else
static void
selectDumpableCast(CastInfo *cast)
{
+ if (checkExtensionMembership(&cast->dobj))
+ return; /* extension membership overrides all else */
+
if (cast->dobj.catId.oid < (Oid) FirstNormalObjectId)
cast->dobj.dump = false;
else
cast->dobj.dump = include_everything;
}
+/*
+ * selectDumpableProcLang: policy-setting subroutine
+ * Mark a procedural language as to be dumped or not
+ *
+ * Procedural languages do not belong to any particular namespace. To
+ * identify built-in languages, we must resort to checking whether the
+ * language's OID is in the range reserved for initdb.
+ */
+static void
+selectDumpableProcLang(ProcLangInfo *plang)
+{
+ if (checkExtensionMembership(&plang->dobj))
+ return; /* extension membership overrides all else */
+
+ if (plang->dobj.catId.oid < (Oid) FirstNormalObjectId)
+ plang->dobj.dump = false;
+ else
+ plang->dobj.dump = include_everything;
+}
+
/*
* selectDumpableExtension: policy-setting subroutine
* Mark an extension as to be dumped or not
static void
selectDumpableObject(DumpableObject *dobj)
{
+ if (checkExtensionMembership(dobj))
+ return; /* extension membership overrides all else */
+
/*
- * Default policy is to dump if parent namespace is dumpable, or always
- * for non-namespace-associated items.
+ * Default policy is to dump if parent namespace is dumpable, or for
+ * non-namespace-associated items, dump if we're dumping "everything".
*/
if (dobj->namespace)
dobj->dump = dobj->namespace->dobj.dump;
else
- dobj->dump = true;
+ dobj->dump = include_everything;
}
/*
evtinfo[i].evttags = pg_strdup(PQgetvalue(res, i, i_evttags));
evtinfo[i].evtfname = pg_strdup(PQgetvalue(res, i, i_evtfname));
evtinfo[i].evtenabled = *(PQgetvalue(res, i, i_evtenabled));
+
+ /* Decide whether we want to dump it */
+ selectDumpableObject(&(evtinfo[i].dobj));
}
PQclear(res);
planginfo[i].lanacl = pg_strdup(PQgetvalue(res, i, i_lanacl));
planginfo[i].lanowner = pg_strdup(PQgetvalue(res, i, i_lanowner));
+ /* Decide whether we want to dump it */
+ selectDumpableProcLang(&(planginfo[i]));
+
if (fout->remoteVersion < 70300)
{
/*
destroyPQExpBuffer(q);
}
-/*
- * Determine whether we want to dump definitions for procedural languages.
- * Since the languages themselves don't have schemas, we can't rely on
- * the normal schema-based selection mechanism. We choose to dump them
- * whenever neither --schema nor --table was given. (Before 8.1, we used
- * the dump flag of the PL's call handler function, but in 8.1 this will
- * probably always be false since call handlers are created in pg_catalog.)
- *
- * For some backwards compatibility with the older behavior, we forcibly
- * dump a PL if its handler function (and validator if any) are in a
- * dumpable namespace. That case is not checked here.
- *
- * Also, if the PL belongs to an extension, we do not use this heuristic.
- * That case isn't checked here either.
- */
-static bool
-shouldDumpProcLangs(void)
-{
- if (!include_everything)
- return false;
- /* And they're schema not data */
- if (dataOnly)
- return false;
- return true;
-}
-
/*
* dumpProcLang
* writes out to fout the queries to recreate a user-defined
/*
* If the functions are dumpable then emit a traditional CREATE LANGUAGE
- * with parameters. Otherwise, dump only if shouldDumpProcLangs() says to
- * dump it.
- *
- * However, for a language that belongs to an extension, we must not use
- * the shouldDumpProcLangs heuristic, but just dump the language iff we're
- * told to (via dobj.dump). Generally the support functions will belong
- * to the same extension and so have the same dump flags ... if they
- * don't, this might not work terribly nicely.
+ * with parameters. Otherwise, we'll write a parameterless command, which
+ * will rely on data from pg_pltemplate.
*/
useParams = (funcInfo != NULL &&
(inlineInfo != NULL || !OidIsValid(plang->laninline)) &&
(validatorInfo != NULL || !OidIsValid(plang->lanvalidator)));
- if (!plang->dobj.ext_member)
- {
- if (!useParams && !shouldDumpProcLangs())
- return;
- }
-
defqry = createPQExpBuffer();
delqry = createPQExpBuffer();
labelq = createPQExpBuffer();
if (!fdwinfo->dobj.dump || dataOnly)
return;
- /*
- * FDWs that belong to an extension are dumped based on their "dump"
- * field. Otherwise omit them if we are only dumping some specific object.
- */
- if (!fdwinfo->dobj.ext_member)
- if (!include_everything)
- return;
-
q = createPQExpBuffer();
delq = createPQExpBuffer();
labelq = createPQExpBuffer();
char *fdwname;
/* Skip if not to be dumped */
- if (!srvinfo->dobj.dump || dataOnly || !include_everything)
+ if (!srvinfo->dobj.dump || dataOnly)
return;
q = createPQExpBuffer();
/*
* getExtensionMembership --- obtain extension membership data
*
- * There are three main parts to this process:
- *
- * 1. Identify objects which are members of extensions
- *
- * Generally speaking, this is to mark them as *not* being dumped, as most
- * extension objects are created by the single CREATE EXTENSION command.
- * The one exception is binary upgrades with pg_upgrade will still dump the
- * non-table objects.
- *
- * 2. Identify and create dump records for extension configuration tables.
- *
- * Extensions can mark tables as "configuration", which means that the user
- * is able and expected to modify those tables after the extension has been
- * loaded. For these tables, we dump out only the data- the structure is
- * expected to be handled at CREATE EXTENSION time, including any indexes or
- * foriegn keys, which brings us to-
- *
- * 3. Record FK dependencies between configuration tables.
- *
- * Due to the FKs being created at CREATE EXTENSION time and therefore before
- * the data is loaded, we have to work out what the best order for reloading
- * the data is, to avoid FK violations when the tables are restored. This is
- * not perfect- we can't handle circular dependencies and if any exist they
- * will cause an invalid dump to be produced (though at least all of the data
- * is included for a user to manually restore). This is currently documented
- * but perhaps we can provide a better solution in the future.
+ * We need to identify objects that are extension members as soon as they're
+ * loaded, so that we can correctly determine whether they need to be dumped.
+ * Generally speaking, extension member objects will get marked as *not* to
+ * be dumped, as they will be recreated by the single CREATE EXTENSION
+ * command. However, in binary upgrade mode we still need to dump the members
+ * individually.
*/
void
getExtensionMembership(Archive *fout, ExtensionInfo extinfo[],
PQExpBuffer query;
PGresult *res;
int ntups,
+ nextmembers,
i;
int i_classid,
i_objid,
- i_refclassid,
- i_refobjid,
- i_conrelid,
- i_confrelid;
- DumpableObject *dobj,
- *refdobj;
+ i_refobjid;
+ ExtensionMemberId *extmembers;
+ ExtensionInfo *ext;
/* Nothing to do if no extensions */
if (numExtensions == 0)
query = createPQExpBuffer();
/* refclassid constraint is redundant but may speed the search */
- appendPQExpBuffer(query, "SELECT "
- "classid, objid, refclassid, refobjid "
- "FROM pg_depend "
- "WHERE refclassid = 'pg_extension'::regclass "
- "AND deptype = 'e' "
- "ORDER BY 3,4");
+ appendPQExpBufferStr(query, "SELECT "
+ "classid, objid, refobjid "
+ "FROM pg_depend "
+ "WHERE refclassid = 'pg_extension'::regclass "
+ "AND deptype = 'e' "
+ "ORDER BY 3");
res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
i_classid = PQfnumber(res, "classid");
i_objid = PQfnumber(res, "objid");
- i_refclassid = PQfnumber(res, "refclassid");
i_refobjid = PQfnumber(res, "refobjid");
+ extmembers = (ExtensionMemberId *) pg_malloc(ntups * sizeof(ExtensionMemberId));
+ nextmembers = 0;
+
/*
+ * Accumulate data into extmembers[].
+ *
* Since we ordered the SELECT by referenced ID, we can expect that
* multiple entries for the same extension will appear together; this
* saves on searches.
*/
- refdobj = NULL;
+ ext = NULL;
for (i = 0; i < ntups; i++)
{
CatalogId objId;
- CatalogId refobjId;
+ Oid extId;
objId.tableoid = atooid(PQgetvalue(res, i, i_classid));
objId.oid = atooid(PQgetvalue(res, i, i_objid));
- refobjId.tableoid = atooid(PQgetvalue(res, i, i_refclassid));
- refobjId.oid = atooid(PQgetvalue(res, i, i_refobjid));
+ extId = atooid(PQgetvalue(res, i, i_refobjid));
- if (refdobj == NULL ||
- refdobj->catId.tableoid != refobjId.tableoid ||
- refdobj->catId.oid != refobjId.oid)
- refdobj = findObjectByCatalogId(refobjId);
+ if (ext == NULL ||
+ ext->dobj.catId.oid != extId)
+ ext = findExtensionByOid(extId);
- /*
- * Failure to find objects mentioned in pg_depend is not unexpected,
- * since for example we don't collect info about TOAST tables.
- */
- if (refdobj == NULL)
+ if (ext == NULL)
{
-#ifdef NOT_USED
- fprintf(stderr, "no referenced object %u %u\n",
- refobjId.tableoid, refobjId.oid);
-#endif
+ /* shouldn't happen */
+ fprintf(stderr, "could not find referenced extension %u\n", extId);
continue;
}
- dobj = findObjectByCatalogId(objId);
+ extmembers[nextmembers].catId = objId;
+ extmembers[nextmembers].ext = ext;
+ nextmembers++;
+ }
- if (dobj == NULL)
- {
-#ifdef NOT_USED
- fprintf(stderr, "no referencing object %u %u\n",
- objId.tableoid, objId.oid);
-#endif
- continue;
- }
+ PQclear(res);
- /* Record dependency so that getDependencies needn't repeat this */
- addObjectDependency(dobj, refdobj->dumpId);
+ /* Remember the data for use later */
+ setExtensionMembership(extmembers, nextmembers);
- dobj->ext_member = true;
+ destroyPQExpBuffer(query);
+}
- /*
- * Normally, mark the member object as not to be dumped. But in
- * binary upgrades, we still dump the members individually, since the
- * idea is to exactly reproduce the database contents rather than
- * replace the extension contents with something different.
- */
- if (!binary_upgrade)
- dobj->dump = false;
- else
- dobj->dump = refdobj->dump;
- }
+/*
+ * processExtensionTables --- deal with extension configuration tables
+ *
+ * There are two parts to this process:
+ *
+ * 1. Identify and create dump records for extension configuration tables.
+ *
+ * Extensions can mark tables as "configuration", which means that the user
+ * is able and expected to modify those tables after the extension has been
+ * loaded. For these tables, we dump out only the data- the structure is
+ * expected to be handled at CREATE EXTENSION time, including any indexes or
+ * foreign keys, which brings us to-
+ *
+ * 2. Record FK dependencies between configuration tables.
+ *
+ * Due to the FKs being created at CREATE EXTENSION time and therefore before
+ * the data is loaded, we have to work out what the best order for reloading
+ * the data is, to avoid FK violations when the tables are restored. This is
+ * not perfect- we can't handle circular dependencies and if any exist they
+ * will cause an invalid dump to be produced (though at least all of the data
+ * is included for a user to manually restore). This is currently documented
+ * but perhaps we can provide a better solution in the future.
+ */
+void
+processExtensionTables(Archive *fout, ExtensionInfo extinfo[],
+ int numExtensions)
+{
+ PQExpBuffer query;
+ PGresult *res;
+ int ntups,
+ i;
+ int i_conrelid,
+ i_confrelid;
- PQclear(res);
+ /* Nothing to do if no extensions */
+ if (numExtensions == 0)
+ return;
/*
- * Now identify extension configuration tables and create TableDataInfo
+ * Identify extension configuration tables and create TableDataInfo
* objects for them, ensuring their data will be dumped even though the
* tables themselves won't be.
*
}
/*
- * Now that all the TableInfoData objects have been created for all
- * the extensions, check their FK dependencies and register them to
- * try and dump the data out in an order which they can be restored
- * in.
+ * Now that all the TableInfoData objects have been created for all the
+ * extensions, check their FK dependencies and register them to try and
+ * dump the data out in an order that they can be restored in.
*
* Note that this is not a problem for user tables as their FKs are
* recreated after the data has been loaded.
*/
+
+ /* Make sure we are in proper schema */
+ selectSourceSchema(fout, "pg_catalog");
+
+ query = createPQExpBuffer();
+
printfPQExpBuffer(query,
"SELECT conrelid, confrelid "
"FROM pg_constraint "
index 1f091ccd85c404849e5491f7db36901440494f22..1e2a00d7a2c36f2d47a558e9880ffda7d1282e72 100644 (file)
char *blobacl;
} BlobInfo;
+/*
+ * We build an array of these with an entry for each object that is an
+ * extension member according to pg_depend.
+ */
+typedef struct _extensionMemberId
+{
+ CatalogId catId; /* tableoid+oid of some member object */
+ ExtensionInfo *ext; /* owning extension */
+} ExtensionMemberId;
+
/* global decls */
extern bool force_quotes; /* double-quotes for identifiers flag */
extern bool g_verbose; /* verbose flag */
extern OprInfo *findOprByOid(Oid oid);
extern CollInfo *findCollationByOid(Oid oid);
extern NamespaceInfo *findNamespaceByOid(Oid oid);
+extern ExtensionInfo *findExtensionByOid(Oid oid);
+
+extern void setExtensionMembership(ExtensionMemberId *extmems, int nextmems);
+extern ExtensionInfo *findOwningExtension(CatalogId catalogId);
extern void simple_oid_list_append(SimpleOidList *list, Oid val);
extern bool simple_oid_list_member(SimpleOidList *list, Oid val);
extern DefaultACLInfo *getDefaultACLs(Archive *fout, int *numDefaultACLs);
extern void getExtensionMembership(Archive *fout, ExtensionInfo extinfo[],
int numExtensions);
+extern void processExtensionTables(Archive *fout, ExtensionInfo extinfo[],
+ int numExtensions);
extern EventTriggerInfo *getEventTriggers(Archive *fout, int *numEventTriggers);
#endif /* PG_DUMP_H */