rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Postpone calls of unsafe server-side functions in pg_dump. 

Avoid calling pg_get_partkeydef(), pg_get_expr(relpartbound),
and regtypeout until we have lock on the relevant tables.
The existing coding is at serious risk of failure if there
are any concurrent DROP TABLE commands going on --- including
drops of other sessions' temp tables.

Back-patch of commit e3fcbbd62.  That's been in v15/HEAD long enough
to have some confidence about it, so now let's fix the problem in
older branches.

Original patch by me; thanks to Gilles Darold for back-patching
legwork.

Discussion: https://postgr.es/m/2273648.1634764485@sss.pgh.pa.us
Discussion: https://postgr.es/m/7d7eb6128f40401d81b3b7a898b6b4de@W2012-02.nidsa.loc
Discussion: https://postgr.es/m/45c93d57-9973-248e-d2df-e02ca9af48d4@darold.net
This commit is contained in:
Tom Lane 2022-11-19 11:40:30 -05:00
parent 038512f71e
commit 55f30e6c76
2 changed files with 79 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
src/bin/pg_dump/pg_dump.c
View File

@ -6322,14 +6322,15 @@ getTables(Archive *fout, int *numTables)
int i_foreignserver; int i_foreignserver;
int i_is_identity_sequence; int i_is_identity_sequence;
int i_changed_acl; int i_changed_acl;
int i_partkeydef;
int i_ispartition; int i_ispartition;
int i_partbound;
int i_amname; int i_amname;
/* /*
* Find all the tables and table-like objects. * Find all the tables and table-like objects.
* *
* We must fetch all tables in this phase because otherwise we cannot
* correctly identify inherited columns, owned sequences, etc.
*
* We include system catalogs, so that we can work if a user table is * We include system catalogs, so that we can work if a user table is
* defined to inherit from a system catalog (pretty weird, but...) * defined to inherit from a system catalog (pretty weird, but...)
* *
@ -6343,8 +6344,10 @@ getTables(Archive *fout, int *numTables)
* *
* Note: in this phase we should collect only a minimal amount of * Note: in this phase we should collect only a minimal amount of
* information about each table, basically just enough to decide if it is * information about each table, basically just enough to decide if it is
* interesting. We must fetch all tables in this phase because otherwise * interesting. In particular, since we do not yet have lock on any user
* we cannot correctly identify inherited columns, owned sequences, etc. * table, we MUST NOT invoke any server-side data collection functions
* (for instance, pg_get_partkeydef()). Those are likely to fail or give
* wrong answers if any concurrent DDL is happening.
* *
* We purposefully ignore toast OIDs for partitioned tables; the reason is * We purposefully ignore toast OIDs for partitioned tables; the reason is
* that versions 10 and 11 have them, but 12 does not, so emitting them * that versions 10 and 11 have them, but 12 does not, so emitting them
@ -6353,9 +6356,7 @@ getTables(Archive *fout, int *numTables)
if (fout->remoteVersion >= 90600) if (fout->remoteVersion >= 90600)
{ {
char *partkeydef = "NULL";
char *ispartition = "false"; char *ispartition = "false";
char *partbound = "NULL";
char *relhasoids = "c.relhasoids"; char *relhasoids = "c.relhasoids";
PQExpBuffer acl_subquery = createPQExpBuffer(); PQExpBuffer acl_subquery = createPQExpBuffer();
@ -6372,13 +6373,8 @@ getTables(Archive *fout, int *numTables)
* Collect the information about any partitioned tables, which were * Collect the information about any partitioned tables, which were
* added in PG10. * added in PG10.
*/ */
if (fout->remoteVersion >= 100000) if (fout->remoteVersion >= 100000)
{
partkeydef = "pg_get_partkeydef(c.oid)";
ispartition = "c.relispartition"; ispartition = "c.relispartition";
partbound = "pg_get_expr(c.relpartbound, c.oid)";
}
/* In PG12 upwards WITH OIDS does not exist anymore. */ /* In PG12 upwards WITH OIDS does not exist anymore. */
if (fout->remoteVersion >= 120000) if (fout->remoteVersion >= 120000)
@ -6419,7 +6415,7 @@ getTables(Archive *fout, int *numTables)
"CASE WHEN c.relkind = 'f' THEN " "CASE WHEN c.relkind = 'f' THEN "
"(SELECT ftserver FROM pg_catalog.pg_foreign_table WHERE ftrelid = c.oid) " "(SELECT ftserver FROM pg_catalog.pg_foreign_table WHERE ftrelid = c.oid) "
"ELSE 0 END AS foreignserver, " "ELSE 0 END AS foreignserver, "
"CASE WHEN c.reloftype <> 0 THEN c.reloftype::pg_catalog.regtype ELSE NULL END AS reloftype, " "c.reloftype, "
"d.refobjid AS owning_tab, " "d.refobjid AS owning_tab, "
"d.refobjsubid AS owning_col, " "d.refobjsubid AS owning_col, "
"(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, " "(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, "
@ -6439,9 +6435,7 @@ getTables(Archive *fout, int *numTables)
"OR %s IS NOT NULL" "OR %s IS NOT NULL"
"))" "))"
"AS changed_acl, " "AS changed_acl, "
"%s AS partkeydef, " "%s AS ispartition "
"%s AS ispartition, "
"%s AS partbound "
"FROM pg_class c " "FROM pg_class c "
"LEFT JOIN pg_depend d ON " "LEFT JOIN pg_depend d ON "
"(c.relkind = '%c' AND " "(c.relkind = '%c' AND "
@ -6467,9 +6461,7 @@ getTables(Archive *fout, int *numTables)
attracl_subquery->data, attracl_subquery->data,
attinitacl_subquery->data, attinitacl_subquery->data,
attinitracl_subquery->data, attinitracl_subquery->data,
partkeydef,
ispartition, ispartition,
partbound,
RELKIND_SEQUENCE, RELKIND_SEQUENCE,
RELKIND_PARTITIONED_TABLE, RELKIND_PARTITIONED_TABLE,
RELKIND_RELATION, RELKIND_SEQUENCE, RELKIND_RELATION, RELKIND_SEQUENCE,
@ -6512,7 +6504,7 @@ getTables(Archive *fout, int *numTables)
"CASE WHEN c.relkind = 'f' THEN " "CASE WHEN c.relkind = 'f' THEN "
"(SELECT ftserver FROM pg_catalog.pg_foreign_table WHERE ftrelid = c.oid) " "(SELECT ftserver FROM pg_catalog.pg_foreign_table WHERE ftrelid = c.oid) "
"ELSE 0 END AS foreignserver, " "ELSE 0 END AS foreignserver, "
"CASE WHEN c.reloftype <> 0 THEN c.reloftype::pg_catalog.regtype ELSE NULL END AS reloftype, " "c.reloftype, "
"d.refobjid AS owning_tab, " "d.refobjid AS owning_tab, "
"d.refobjsubid AS owning_col, " "d.refobjsubid AS owning_col, "
"(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, " "(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, "
@ -6521,9 +6513,7 @@ getTables(Archive *fout, int *numTables)
"WHEN 'check_option=cascaded' = ANY (c.reloptions) THEN 'CASCADED'::text ELSE NULL END AS checkoption, " "WHEN 'check_option=cascaded' = ANY (c.reloptions) THEN 'CASCADED'::text ELSE NULL END AS checkoption, "
"tc.reloptions AS toast_reloptions, " "tc.reloptions AS toast_reloptions, "
"NULL AS changed_acl, " "NULL AS changed_acl, "
"NULL AS partkeydef, " "false AS ispartition "
"false AS ispartition, "
"NULL AS partbound "
"FROM pg_class c " "FROM pg_class c "
"LEFT JOIN pg_depend d ON " "LEFT JOIN pg_depend d ON "
"(c.relkind = '%c' AND " "(c.relkind = '%c' AND "
@ -6565,7 +6555,7 @@ getTables(Archive *fout, int *numTables)
"CASE WHEN c.relkind = 'f' THEN " "CASE WHEN c.relkind = 'f' THEN "
"(SELECT ftserver FROM pg_catalog.pg_foreign_table WHERE ftrelid = c.oid) " "(SELECT ftserver FROM pg_catalog.pg_foreign_table WHERE ftrelid = c.oid) "
"ELSE 0 END AS foreignserver, " "ELSE 0 END AS foreignserver, "
"CASE WHEN c.reloftype <> 0 THEN c.reloftype::pg_catalog.regtype ELSE NULL END AS reloftype, " "c.reloftype, "
"d.refobjid AS owning_tab, " "d.refobjid AS owning_tab, "
"d.refobjsubid AS owning_col, " "d.refobjsubid AS owning_col, "
"(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, " "(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, "
@ -6574,9 +6564,7 @@ getTables(Archive *fout, int *numTables)
"WHEN 'check_option=cascaded' = ANY (c.reloptions) THEN 'CASCADED'::text ELSE NULL END AS checkoption, " "WHEN 'check_option=cascaded' = ANY (c.reloptions) THEN 'CASCADED'::text ELSE NULL END AS checkoption, "
"tc.reloptions AS toast_reloptions, " "tc.reloptions AS toast_reloptions, "
"NULL AS changed_acl, " "NULL AS changed_acl, "
"NULL AS partkeydef, " "false AS ispartition "
"false AS ispartition, "
"NULL AS partbound "
"FROM pg_class c " "FROM pg_class c "
"LEFT JOIN pg_depend d ON " "LEFT JOIN pg_depend d ON "
"(c.relkind = '%c' AND " "(c.relkind = '%c' AND "
@ -6618,7 +6606,7 @@ getTables(Archive *fout, int *numTables)
"CASE WHEN c.relkind = 'f' THEN " "CASE WHEN c.relkind = 'f' THEN "
"(SELECT ftserver FROM pg_catalog.pg_foreign_table WHERE ftrelid = c.oid) " "(SELECT ftserver FROM pg_catalog.pg_foreign_table WHERE ftrelid = c.oid) "
"ELSE 0 END AS foreignserver, " "ELSE 0 END AS foreignserver, "
"CASE WHEN c.reloftype <> 0 THEN c.reloftype::pg_catalog.regtype ELSE NULL END AS reloftype, " "c.reloftype, "
"d.refobjid AS owning_tab, " "d.refobjid AS owning_tab, "
"d.refobjsubid AS owning_col, " "d.refobjsubid AS owning_col, "
"(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, " "(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, "
@ -6627,9 +6615,7 @@ getTables(Archive *fout, int *numTables)
"WHEN 'check_option=cascaded' = ANY (c.reloptions) THEN 'CASCADED'::text ELSE NULL END AS checkoption, " "WHEN 'check_option=cascaded' = ANY (c.reloptions) THEN 'CASCADED'::text ELSE NULL END AS checkoption, "
"tc.reloptions AS toast_reloptions, " "tc.reloptions AS toast_reloptions, "
"NULL AS changed_acl, " "NULL AS changed_acl, "
"NULL AS partkeydef, " "false AS ispartition "
"false AS ispartition, "
"NULL AS partbound "
"FROM pg_class c " "FROM pg_class c "
"LEFT JOIN pg_depend d ON " "LEFT JOIN pg_depend d ON "
"(c.relkind = '%c' AND " "(c.relkind = '%c' AND "
@ -6671,16 +6657,14 @@ getTables(Archive *fout, int *numTables)
"CASE WHEN c.relkind = 'f' THEN " "CASE WHEN c.relkind = 'f' THEN "
"(SELECT ftserver FROM pg_catalog.pg_foreign_table WHERE ftrelid = c.oid) " "(SELECT ftserver FROM pg_catalog.pg_foreign_table WHERE ftrelid = c.oid) "
"ELSE 0 END AS foreignserver, " "ELSE 0 END AS foreignserver, "
"CASE WHEN c.reloftype <> 0 THEN c.reloftype::pg_catalog.regtype ELSE NULL END AS reloftype, " "c.reloftype, "
"d.refobjid AS owning_tab, " "d.refobjid AS owning_tab, "
"d.refobjsubid AS owning_col, " "d.refobjsubid AS owning_col, "
"(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, " "(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, "
"c.reloptions AS reloptions, " "c.reloptions AS reloptions, "
"tc.reloptions AS toast_reloptions, " "tc.reloptions AS toast_reloptions, "
"NULL AS changed_acl, " "NULL AS changed_acl, "
"NULL AS partkeydef, " "false AS ispartition "
"false AS ispartition, "
"NULL AS partbound "
"FROM pg_class c " "FROM pg_class c "
"LEFT JOIN pg_depend d ON " "LEFT JOIN pg_depend d ON "
"(c.relkind = '%c' AND " "(c.relkind = '%c' AND "
@ -6720,16 +6704,14 @@ getTables(Archive *fout, int *numTables)
"'d' AS relreplident, c.relpages, " "'d' AS relreplident, c.relpages, "
"NULL AS amname, " "NULL AS amname, "
"NULL AS foreignserver, " "NULL AS foreignserver, "
"CASE WHEN c.reloftype <> 0 THEN c.reloftype::pg_catalog.regtype ELSE NULL END AS reloftype, " "c.reloftype, "
"d.refobjid AS owning_tab, " "d.refobjid AS owning_tab, "
"d.refobjsubid AS owning_col, " "d.refobjsubid AS owning_col, "
"(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, " "(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, "
"c.reloptions AS reloptions, " "c.reloptions AS reloptions, "
"tc.reloptions AS toast_reloptions, " "tc.reloptions AS toast_reloptions, "
"NULL AS changed_acl, " "NULL AS changed_acl, "
"NULL AS partkeydef, " "false AS ispartition "
"false AS ispartition, "
"NULL AS partbound "
"FROM pg_class c " "FROM pg_class c "
"LEFT JOIN pg_depend d ON " "LEFT JOIN pg_depend d ON "
"(c.relkind = '%c' AND " "(c.relkind = '%c' AND "
@ -6768,16 +6750,14 @@ getTables(Archive *fout, int *numTables)
"'d' AS relreplident, c.relpages, " "'d' AS relreplident, c.relpages, "
"NULL AS amname, " "NULL AS amname, "
"NULL AS foreignserver, " "NULL AS foreignserver, "
"NULL AS reloftype, " "0 AS reloftype, "
"d.refobjid AS owning_tab, " "d.refobjid AS owning_tab, "
"d.refobjsubid AS owning_col, " "d.refobjsubid AS owning_col, "
"(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, " "(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, "
"c.reloptions AS reloptions, " "c.reloptions AS reloptions, "
"tc.reloptions AS toast_reloptions, " "tc.reloptions AS toast_reloptions, "
"NULL AS changed_acl, " "NULL AS changed_acl, "
"NULL AS partkeydef, " "false AS ispartition "
"false AS ispartition, "
"NULL AS partbound "
"FROM pg_class c " "FROM pg_class c "
"LEFT JOIN pg_depend d ON " "LEFT JOIN pg_depend d ON "
"(c.relkind = '%c' AND " "(c.relkind = '%c' AND "
@ -6816,16 +6796,14 @@ getTables(Archive *fout, int *numTables)
"'d' AS relreplident, c.relpages, " "'d' AS relreplident, c.relpages, "
"NULL AS amname, " "NULL AS amname, "
"NULL AS foreignserver, " "NULL AS foreignserver, "
"NULL AS reloftype, " "0 AS reloftype, "
"d.refobjid AS owning_tab, " "d.refobjid AS owning_tab, "
"d.refobjsubid AS owning_col, " "d.refobjsubid AS owning_col, "
"(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, " "(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, "
"c.reloptions AS reloptions, " "c.reloptions AS reloptions, "
"NULL AS toast_reloptions, " "NULL AS toast_reloptions, "
"NULL AS changed_acl, " "NULL AS changed_acl, "
"NULL AS partkeydef, " "false AS ispartition "
"false AS ispartition, "
"NULL AS partbound "
"FROM pg_class c " "FROM pg_class c "
"LEFT JOIN pg_depend d ON " "LEFT JOIN pg_depend d ON "
"(c.relkind = '%c' AND " "(c.relkind = '%c' AND "
@ -6863,16 +6841,14 @@ getTables(Archive *fout, int *numTables)
"'d' AS relreplident, relpages, " "'d' AS relreplident, relpages, "
"NULL AS amname, " "NULL AS amname, "
"NULL AS foreignserver, " "NULL AS foreignserver, "
"NULL AS reloftype, " "0 AS reloftype, "
"d.refobjid AS owning_tab, " "d.refobjid AS owning_tab, "
"d.refobjsubid AS owning_col, " "d.refobjsubid AS owning_col, "
"(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, " "(SELECT spcname FROM pg_tablespace t WHERE t.oid = c.reltablespace) AS reltablespace, "
"NULL AS reloptions, " "NULL AS reloptions, "
"NULL AS toast_reloptions, " "NULL AS toast_reloptions, "
"NULL AS changed_acl, " "NULL AS changed_acl, "
"NULL AS partkeydef, " "false AS ispartition "
"false AS ispartition, "
"NULL AS partbound "
"FROM pg_class c " "FROM pg_class c "
"LEFT JOIN pg_depend d ON " "LEFT JOIN pg_depend d ON "
"(c.relkind = '%c' AND " "(c.relkind = '%c' AND "
@ -6940,9 +6916,7 @@ getTables(Archive *fout, int *numTables)
i_reloftype = PQfnumber(res, "reloftype"); i_reloftype = PQfnumber(res, "reloftype");
i_is_identity_sequence = PQfnumber(res, "is_identity_sequence"); i_is_identity_sequence = PQfnumber(res, "is_identity_sequence");
i_changed_acl = PQfnumber(res, "changed_acl"); i_changed_acl = PQfnumber(res, "changed_acl");
i_partkeydef = PQfnumber(res, "partkeydef");
i_ispartition = PQfnumber(res, "ispartition"); i_ispartition = PQfnumber(res, "ispartition");
i_partbound = PQfnumber(res, "partbound");
i_amname = PQfnumber(res, "amname"); i_amname = PQfnumber(res, "amname");
if (dopt->lockWaitTimeout) if (dopt->lockWaitTimeout)
@ -6990,10 +6964,7 @@ getTables(Archive *fout, int *numTables)
tblinfo[i].toast_oid = atooid(PQgetvalue(res, i, i_toastoid)); tblinfo[i].toast_oid = atooid(PQgetvalue(res, i, i_toastoid));
tblinfo[i].toast_frozenxid = atooid(PQgetvalue(res, i, i_toastfrozenxid)); tblinfo[i].toast_frozenxid = atooid(PQgetvalue(res, i, i_toastfrozenxid));
tblinfo[i].toast_minmxid = atooid(PQgetvalue(res, i, i_toastminmxid)); tblinfo[i].toast_minmxid = atooid(PQgetvalue(res, i, i_toastminmxid));
if (PQgetisnull(res, i, i_reloftype)) tblinfo[i].reloftype = atooid(PQgetvalue(res, i, i_reloftype));
tblinfo[i].reloftype = NULL;
else
tblinfo[i].reloftype = pg_strdup(PQgetvalue(res, i, i_reloftype));
tblinfo[i].ncheck = atoi(PQgetvalue(res, i, i_relchecks)); tblinfo[i].ncheck = atoi(PQgetvalue(res, i, i_relchecks));
if (PQgetisnull(res, i, i_owning_tab)) if (PQgetisnull(res, i, i_owning_tab))
{ {
@ -7049,10 +7020,8 @@ getTables(Archive *fout, int *numTables)
tblinfo[i].is_identity_sequence = (i_is_identity_sequence >= 0 && tblinfo[i].is_identity_sequence = (i_is_identity_sequence >= 0 &&
strcmp(PQgetvalue(res, i, i_is_identity_sequence), "t") == 0); strcmp(PQgetvalue(res, i, i_is_identity_sequence), "t") == 0);
/* Partition key string or NULL */ /* Partition? */
tblinfo[i].partkeydef = pg_strdup(PQgetvalue(res, i, i_partkeydef));
tblinfo[i].ispartition = (strcmp(PQgetvalue(res, i, i_ispartition), "t") == 0); tblinfo[i].ispartition = (strcmp(PQgetvalue(res, i, i_ispartition), "t") == 0);
tblinfo[i].partbound = pg_strdup(PQgetvalue(res, i, i_partbound));
/* foreign server */ /* foreign server */
tblinfo[i].foreign_server = atooid(PQgetvalue(res, i, i_foreignserver)); tblinfo[i].foreign_server = atooid(PQgetvalue(res, i, i_foreignserver));
@ -15930,12 +15899,34 @@ dumpTableSchema(Archive *fout, const TableInfo *tbinfo)
} }
else else
{ {
char *partkeydef = NULL;
char *ftoptions = NULL; char *ftoptions = NULL;
char *srvname = NULL; char *srvname = NULL;
char *foreign = ""; char *foreign = "";
/*
* Set reltypename, and collect any relkind-specific data that we
* didn't fetch during getTables().
*/
switch (tbinfo->relkind) switch (tbinfo->relkind)
{ {
case RELKIND_PARTITIONED_TABLE:
{
PQExpBuffer query = createPQExpBuffer();
PGresult *res;
reltypename = "TABLE";
/* retrieve partition key definition */
appendPQExpBuffer(query,
"SELECT pg_get_partkeydef('%u')",
tbinfo->dobj.catId.oid);
res = ExecuteSqlQueryForSingleRow(fout, query->data);
partkeydef = pg_strdup(PQgetvalue(res, 0, 0));
PQclear(res);
destroyPQExpBuffer(query);
break;
}
case RELKIND_FOREIGN_TABLE: case RELKIND_FOREIGN_TABLE:
{ {
PQExpBuffer query = createPQExpBuffer(); PQExpBuffer query = createPQExpBuffer();
@ -15975,6 +15966,7 @@ dumpTableSchema(Archive *fout, const TableInfo *tbinfo)
break; break;
default: default:
reltypename = "TABLE"; reltypename = "TABLE";
break;
} }
numParents = tbinfo->numParents; numParents = tbinfo->numParents;
@ -15996,8 +15988,10 @@ dumpTableSchema(Archive *fout, const TableInfo *tbinfo)
* Attach to type, if reloftype; except in case of a binary upgrade, * Attach to type, if reloftype; except in case of a binary upgrade,
* we dump the table normally and attach it to the type afterward. * we dump the table normally and attach it to the type afterward.
*/ */
if (tbinfo->reloftype && !dopt->binary_upgrade) if (OidIsValid(tbinfo->reloftype) && !dopt->binary_upgrade)
appendPQExpBuffer(q, " OF %s", tbinfo->reloftype); appendPQExpBuffer(q, " OF %s",
getFormattedTypeName(fout, tbinfo->reloftype,
zeroIsError));
if (tbinfo->relkind != RELKIND_MATVIEW) if (tbinfo->relkind != RELKIND_MATVIEW)
{ {
@ -16035,7 +16029,8 @@ dumpTableSchema(Archive *fout, const TableInfo *tbinfo)
* Skip column if fully defined by reloftype, except in * Skip column if fully defined by reloftype, except in
* binary upgrade * binary upgrade
*/ */
if (tbinfo->reloftype && !print_default && !print_notnull && if (OidIsValid(tbinfo->reloftype) &&
!print_default && !print_notnull &&
!dopt->binary_upgrade) !dopt->binary_upgrade)
continue; continue;
@ -16068,7 +16063,7 @@ dumpTableSchema(Archive *fout, const TableInfo *tbinfo)
* table ('OF type_name'), but in binary-upgrade mode, * table ('OF type_name'), but in binary-upgrade mode,
* print it in that case too. * print it in that case too.
*/ */
if (dopt->binary_upgrade || !tbinfo->reloftype) if (dopt->binary_upgrade || !OidIsValid(tbinfo->reloftype))
{ {
appendPQExpBuffer(q, " %s", appendPQExpBuffer(q, " %s",
tbinfo->atttypnames[j]); tbinfo->atttypnames[j]);
@ -16131,7 +16126,7 @@ dumpTableSchema(Archive *fout, const TableInfo *tbinfo)
if (actual_atts) if (actual_atts)
appendPQExpBufferStr(q, "\n)"); appendPQExpBufferStr(q, "\n)");
else if (!(tbinfo->reloftype && !dopt->binary_upgrade)) else if (!(OidIsValid(tbinfo->reloftype) && !dopt->binary_upgrade))
{ {
/* /*
* No attributes? we must have a parenthesized attribute list, * No attributes? we must have a parenthesized attribute list,
@ -16160,7 +16155,7 @@ dumpTableSchema(Archive *fout, const TableInfo *tbinfo)
} }
if (tbinfo->relkind == RELKIND_PARTITIONED_TABLE) if (tbinfo->relkind == RELKIND_PARTITIONED_TABLE)
appendPQExpBuffer(q, "\nPARTITION BY %s", tbinfo->partkeydef); appendPQExpBuffer(q, "\nPARTITION BY %s", partkeydef);
if (tbinfo->relkind == RELKIND_FOREIGN_TABLE) if (tbinfo->relkind == RELKIND_FOREIGN_TABLE)
appendPQExpBuffer(q, "\nSERVER %s", fmtId(srvname)); appendPQExpBuffer(q, "\nSERVER %s", fmtId(srvname));
@ -16343,12 +16338,13 @@ dumpTableSchema(Archive *fout, const TableInfo *tbinfo)
} }
} }
if (tbinfo->reloftype) if (OidIsValid(tbinfo->reloftype))
{ {
appendPQExpBufferStr(q, "\n-- For binary upgrade, set up typed tables this way.\n"); appendPQExpBufferStr(q, "\n-- For binary upgrade, set up typed tables this way.\n");
appendPQExpBuffer(q, "ALTER TABLE ONLY %s OF %s;\n", appendPQExpBuffer(q, "ALTER TABLE ONLY %s OF %s;\n",
qualrelname, qualrelname,
tbinfo->reloftype); getFormattedTypeName(fout, tbinfo->reloftype,
zeroIsError));
} }
} }
@ -16521,6 +16517,8 @@ dumpTableSchema(Archive *fout, const TableInfo *tbinfo)
tbinfo->attfdwoptions[j]); tbinfo->attfdwoptions[j]);
} /* end loop over columns */ } /* end loop over columns */
if (partkeydef)
free(partkeydef);
if (ftoptions) if (ftoptions)
free(ftoptions); free(ftoptions);
if (srvname) if (srvname)
@ -16628,6 +16626,8 @@ dumpTableAttach(Archive *fout, const TableAttachInfo *attachinfo)
{ {
DumpOptions *dopt = fout->dopt; DumpOptions *dopt = fout->dopt;
PQExpBuffer q; PQExpBuffer q;
PGresult *res;
char *partbound;
if (dopt->dataOnly) if (dopt->dataOnly)
return; return;
@ -16637,14 +16637,23 @@ dumpTableAttach(Archive *fout, const TableAttachInfo *attachinfo)
q = createPQExpBuffer(); q = createPQExpBuffer();
/* Perform ALTER TABLE on the parent */ /* Fetch the partition's partbound */
appendPQExpBuffer(q, appendPQExpBuffer(q,
"SELECT pg_get_expr(c.relpartbound, c.oid) "
"FROM pg_class c "
"WHERE c.oid = '%u'",
attachinfo->partitionTbl->dobj.catId.oid);
res = ExecuteSqlQueryForSingleRow(fout, q->data);
partbound = PQgetvalue(res, 0, 0);
/* Perform ALTER TABLE on the parent */
printfPQExpBuffer(q,
"ALTER TABLE ONLY %s ", "ALTER TABLE ONLY %s ",
fmtQualifiedDumpable(attachinfo->parentTbl)); fmtQualifiedDumpable(attachinfo->parentTbl));
appendPQExpBuffer(q, appendPQExpBuffer(q,
"ATTACH PARTITION %s %s;\n", "ATTACH PARTITION %s %s;\n",
fmtQualifiedDumpable(attachinfo->partitionTbl), fmtQualifiedDumpable(attachinfo->partitionTbl),
attachinfo->partitionTbl->partbound); partbound);
/* /*
* There is no point in creating a drop query as the drop is done by table * There is no point in creating a drop query as the drop is done by table
@ -16661,6 +16670,7 @@ dumpTableAttach(Archive *fout, const TableAttachInfo *attachinfo)
.section = SECTION_PRE_DATA, .section = SECTION_PRE_DATA,
.createStmt = q->data)); .createStmt = q->data));
PQclear(res);
destroyPQExpBuffer(q); destroyPQExpBuffer(q);
} }

4
src/bin/pg_dump/pg_dump.h
View File

@ -286,7 +286,7 @@ typedef struct _tableInfo
uint32 toast_frozenxid; /* toast table's relfrozenxid, if any */ uint32 toast_frozenxid; /* toast table's relfrozenxid, if any */
uint32 toast_minmxid; /* toast table's relminmxid */ uint32 toast_minmxid; /* toast table's relminmxid */
int ncheck; /* # of CHECK expressions */ int ncheck; /* # of CHECK expressions */
char *reloftype; /* underlying type for typed table */ Oid reloftype; /* underlying type for typed table */
Oid foreign_server; /* foreign server oid, if applicable */ Oid foreign_server; /* foreign server oid, if applicable */
/* these two are set only if table is a sequence owned by a column: */ /* these two are set only if table is a sequence owned by a column: */
Oid owning_tab; /* OID of table owning sequence */ Oid owning_tab; /* OID of table owning sequence */
@ -325,8 +325,6 @@ typedef struct _tableInfo
bool *inhNotNull; /* true if NOT NULL is inherited */ bool *inhNotNull; /* true if NOT NULL is inherited */
struct _attrDefInfo **attrdefs; /* DEFAULT expressions */ struct _attrDefInfo **attrdefs; /* DEFAULT expressions */
struct _constraintInfo *checkexprs; /* CHECK constraints */ struct _constraintInfo *checkexprs; /* CHECK constraints */
char *partkeydef; /* partition key definition */
char *partbound; /* partition bound definition */
bool needs_override; /* has GENERATED ALWAYS AS IDENTITY */ bool needs_override; /* has GENERATED ALWAYS AS IDENTITY */
char *amname; /* relation access method */ char *amname; /* relation access method */