rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-10-01 16:01:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix quoting and a compiler warning in dumping partitions.

Browse Source 
Partition name needs to be quoted in the ATTACH PARTITION command
constructed in binary-upgrade mode.

Silence compiler warning about set but unused variable, without
--enable-cassert.
This commit is contained in:
Heikki Linnakangas 2016-12-08 14:10:10 +02:00
parent fe7bdf0bf6
commit 2560d244b4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7022,8 +7022,7 @@ void
getTablePartitionKeyInfo(Archive *fout, TableInfo *tblinfo, int numTables) getTablePartitionKeyInfo(Archive *fout, TableInfo *tblinfo, int numTables)
{ {
PQExpBuffer q = createPQExpBuffer(); PQExpBuffer q = createPQExpBuffer();
int i, int i;
ntups;
PGresult *res; PGresult *res;
/* No partitioned tables before 10 */ /* No partitioned tables before 10 */
@ -7046,8 +7045,7 @@ getTablePartitionKeyInfo(Archive *fout, TableInfo *tblinfo, int numTables)
appendPQExpBuffer(q, "SELECT pg_catalog.pg_get_partkeydef('%u'::pg_catalog.oid)", appendPQExpBuffer(q, "SELECT pg_catalog.pg_get_partkeydef('%u'::pg_catalog.oid)",
tbinfo->dobj.catId.oid); tbinfo->dobj.catId.oid);
res = ExecuteSqlQuery(fout, q->data, PGRES_TUPLES_OK); res = ExecuteSqlQuery(fout, q->data, PGRES_TUPLES_OK);
ntups = PQntuples(res); Assert(PQntuples(res) == 1);
Assert(ntups == 1);
tbinfo->partkeydef = pg_strdup(PQgetvalue(res, 0, 0)); tbinfo->partkeydef = pg_strdup(PQgetvalue(res, 0, 0));
} }
} }
@ -14639,9 +14637,10 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
if (tbinfo->partitionOf) if (tbinfo->partitionOf)
{ {
appendPQExpBufferStr(q, "\n-- For binary upgrade, set up partitions this way.\n"); appendPQExpBufferStr(q, "\n-- For binary upgrade, set up partitions this way.\n");
appendPQExpBuffer(q, "ALTER TABLE ONLY %s ATTACH PARTITION %s %s;\n", appendPQExpBuffer(q, "ALTER TABLE ONLY %s ",
fmtId(tbinfo->partitionOf->dobj.name), fmtId(tbinfo->partitionOf->dobj.name));
tbinfo->dobj.name, appendPQExpBuffer(q, "ATTACH PARTITION %s %s;\n",
fmtId(tbinfo->dobj.name),
tbinfo->partitiondef); tbinfo->partitiondef);
} }