database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-17 17:02:08 +03:00
Code Activity

Avoid crash in ALTER TABLE not_partitioned DETACH PARTITION.

Browse Source 
Amit Langote, reviewed and slightly changed by me.
This commit is contained in:
Robert Haas
2017-02-16 08:37:37 -05:00
parent 93e6e40574
commit 59407301a3
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/backend/parser/parse_utilcmd.c
View File

@ -133,7 +133,7 @@ static void transformConstraintAttrs(CreateStmtContext *cxt,
List *constraintList);
static void transformColumnType(CreateStmtContext *cxt, ColumnDef *column);
static void setSchemaName(char *context_schema, char **stmt_schema_name);
static void transformAttachPartition(CreateStmtContext *cxt, PartitionCmd *cmd);
static void transformPartitionCmd(CreateStmtContext *cxt, PartitionCmd *cmd);
/*
@ -2654,12 +2654,12 @@ transformAlterTableStmt(Oid relid, AlterTableStmt *stmt,
}
case AT_AttachPartition:
case AT_DetachPartition:
{
PartitionCmd *partcmd = (PartitionCmd *) cmd->def;
transformAttachPartition(&cxt, partcmd);
/* assign transformed values */
transformPartitionCmd(&cxt, partcmd);
/* assign transformed value of the partition bound */
partcmd->bound = cxt.partbound;
}
@ -3032,28 +3032,29 @@ setSchemaName(char *context_schema, char **stmt_schema_name)
}
/*
* transformAttachPartition
* Analyze ATTACH PARTITION ... FOR VALUES ...
* transformPartitionCmd
* Analyze the ATTACH/DETACH PARTITION command
*
* In case of the ATTACH PARTITION command, cxt->partbound is set to the
* transformed value of cmd->bound.
*/
static void
transformAttachPartition(CreateStmtContext *cxt, PartitionCmd *cmd)
transformPartitionCmd(CreateStmtContext *cxt, PartitionCmd *cmd)
{
Relation parentRel = cxt->rel;
/*
* We are going to try to validate the partition bound specification
* against the partition key of rel, so it better have one.
*/
/* the table must be partitioned */
if (parentRel->rd_rel->relkind != RELKIND_PARTITIONED_TABLE)
ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("\"%s\" is not partitioned",
RelationGetRelationName(parentRel))));
/* transform the values */
/* transform the partition bound, if any */
Assert(RelationGetPartitionKey(parentRel) != NULL);
cxt->partbound = transformPartitionBound(cxt->pstate, parentRel,
cmd->bound);
if (cmd->bound != NULL)
cxt->partbound = transformPartitionBound(cxt->pstate, parentRel,
cmd->bound);
}
/*