Commit29f20db

committed

Assign collations in partition bound expressions.

Failure to do this can result in errors during evaluation ofthe bound expression, as illustrated by the new regression test.Back-patch to v12 where the ability for partition bounds to beexpressions was added.Discussion:https://postgr.es/m/CAJV4CdrZ5mKuaEsRSbLf2URQ3h6iMtKD=hik8MaF5WwdmC9uZw@mail.gmail.com

1 parentbda3273 commit29f20dbCopy full SHA for 29f20db

File tree

+18

-0

lines changed

+18

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4197,7 +4197,10 @@ transformPartitionBoundValue(ParseState pstate, Node val,`
`4197`	`4197`
`4198`	`4198`	`/* Simplify the expression, in case we had a coercion */`
`4199`	`4199`	`if (!IsA(value,Const))`
	`4200`	`+{`
	`4201`	`+assign_expr_collations(pstate,value);`
`4200`	`4202`	`value= (Node)expression_planner((Expr)value);`
	`4203`	`+}`
`4201`	`4204`
`4202`	`4205`	`/*`
`4203`	`4206`	`* transformExpr() should have already rejected column references,`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -937,6 +937,13 @@ DETAIL: Failing row contains (1, null).`
`937`	`937`	`Partition of: parted_notnull_inh_test FOR VALUES IN (1)`
`938`	`938`
`939`	`939`	`drop table parted_notnull_inh_test;`
	`940`	`+-- check that collations are assigned in partition bound expressions`
	`941`	`+create table parted_boolean_col (a bool, b text) partition by list(a);`
	`942`	`+create table parted_boolean_less partition of parted_boolean_col`
	`943`	`+ for values in ('foo' < 'bar');`
	`944`	`+create table parted_boolean_greater partition of parted_boolean_col`
	`945`	`+ for values in ('foo' > 'bar');`
	`946`	`+drop table parted_boolean_col;`
`940`	`947`	`-- check for a conflicting COLLATE clause`
`941`	`948`	`create table parted_collate_must_match (a text collate "C", b text collate "C")`
`942`	`949`	`partition by range (a);`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -769,6 +769,14 @@ insert into parted_notnull_inh_test (b) values (null);`
`769`	`769`	`\d parted_notnull_inh_test1`
`770`	`770`	`droptable parted_notnull_inh_test;`
`771`	`771`
	`772`	`+-- check that collations are assigned in partition bound expressions`
	`773`	`+createtableparted_boolean_col (a bool, btext) partition by list(a);`
	`774`	`+createtableparted_boolean_less partition of parted_boolean_col`
	`775`	`+ forvaluesin ('foo'<'bar');`
	`776`	`+createtableparted_boolean_greater partition of parted_boolean_col`
	`777`	`+ forvaluesin ('foo'>'bar');`
	`778`	`+droptable parted_boolean_col;`
	`779`	`+`
`772`	`780`	`-- check for a conflicting COLLATE clause`
`773`	`781`	`createtableparted_collate_must_match (atext collate"C", btext collate"C")`
`774`	`782`	`partition by range (a);`

Comments

(0)