Commite28b115

committed

Don't disallow dropping NOT NULL for a list partition key.

Range partitioning doesn't support nulls in the partitioning columns,but list partitioning does.Amit Langote, per a complaint from Amul Sul

1 parent8d396a0 commite28b115Copy full SHA for e28b115

File tree

+22

-9

lines changed

+22

-9

lines changed

Lines changed: 13 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -5593,18 +5593,22 @@ ATExecDropNotNull(Relation rel, const char *colName, LOCKMODE lockmode)`
`5593`	`5593`	`if (rel->rd_rel->relkind==RELKIND_PARTITIONED_TABLE)`
`5594`	`5594`	`{`
`5595`	`5595`	`PartitionKeykey=RelationGetPartitionKey(rel);`
`5596`		`-intpartnatts=get_partition_natts(key),`
`5597`		`-i;`
`5598`	`5596`
`5599`		`-for (i=0;i<partnatts;i++)`
	`5597`	`+if (get_partition_strategy(key)==PARTITION_STRATEGY_RANGE)`
`5600`	`5598`	`{`
`5601`		`-AttrNumberpartattnum=get_partition_col_attnum(key,i);`
	`5599`	`+intpartnatts=get_partition_natts(key),`
	`5600`	`+i;`
`5602`	`5601`
`5603`		`-if (partattnum==attnum)`
`5604`		`-ereport(ERROR,`
`5605`		`-(errcode(ERRCODE_INVALID_TABLE_DEFINITION),`
`5606`		`-errmsg("column \"%s\" is in range partition key",`
`5607`		`-colName)));`
	`5602`	`+for (i=0;i<partnatts;i++)`
	`5603`	`+{`
	`5604`	`+AttrNumberpartattnum=get_partition_col_attnum(key,i);`
	`5605`	`+`
	`5606`	`+if (partattnum==attnum)`
	`5607`	`+ereport(ERROR,`
	`5608`	`+(errcode(ERRCODE_INVALID_TABLE_DEFINITION),`
	`5609`	`+errmsg("column \"%s\" is in range partition key",`
	`5610`	`+colName)));`
	`5611`	`+}`
`5608`	`5612`	`}`
`5609`	`5613`	`}`
`5610`	`5614`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3029,6 +3029,10 @@ ERROR: cannot alter type of column referenced in partition key expression`
`3029`	`3029`	`-- cannot drop NOT NULL on columns in the range partition key`
`3030`	`3030`	`ALTER TABLE partitioned ALTER COLUMN a DROP NOT NULL;`
`3031`	`3031`	`ERROR: column "a" is in range partition key`
	`3032`	`+-- it's fine however to drop one on the list partition key column`
	`3033`	`+CREATE TABLE list_partitioned (a int not null) partition by list (a);`
	`3034`	`+ALTER TABLE list_partitioned ALTER a DROP NOT NULL;`
	`3035`	`+DROP TABLE list_partitioned;`
`3032`	`3036`	`-- partitioned table cannot participate in regular inheritance`
`3033`	`3037`	`CREATE TABLE foo (`
`3034`	`3038`	`a int,`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1917,6 +1917,11 @@ ALTER TABLE partitioned ALTER COLUMN b TYPE char(5);`
`1917`	`1917`	`-- cannot drop NOT NULL on columns in the range partition key`
`1918`	`1918`	`ALTERTABLE partitioned ALTER COLUMN a DROPNOT NULL;`
`1919`	`1919`
	`1920`	`+-- it's fine however to drop one on the list partition key column`
	`1921`	`+CREATETABLElist_partitioned (aintnot null) partition by list (a);`
	`1922`	`+ALTERTABLE list_partitioned ALTER a DROPNOT NULL;`
	`1923`	`+DROPTABLE list_partitioned;`
	`1924`	`+`
`1920`	`1925`	`-- partitioned table cannot participate in regular inheritance`
`1921`	`1926`	`CREATETABLEfoo (`
`1922`	`1927`	`aint,`

Comments

(0)