git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2dfa3fe)

Assign collations in partition bound expressions.

author Tom Lane <tgl@sss.pgh.pa.us>

2020年9月28日 18:12:38 +0000 (14:12 -0400)

committer Tom Lane <tgl@sss.pgh.pa.us>

2020年9月28日 18:12:38 +0000 (14:12 -0400)

Failure to do this can result in errors during evaluation of
the bound expression, as illustrated by the new regression test.

Back-patch to v12 where the ability for partition bounds to be
expressions was added.

Discussion: https://postgr.es/m/CAJV4CdrZ5mKuaEsRSbLf2URQ3h6iMtKD=hik8MaF5WwdmC9uZw@mail.gmail.com

src/backend/parser/parse_utilcmd.c patch | blob | blame | history

src/test/regress/expected/create_table.out patch | blob | blame | history

src/test/regress/sql/create_table.sql patch | blob | blame | history

diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c

index 6d2f36da2df0b6ecd23c7cf76aa449c31f909c5f..0dc03dd984081c9b88ff306b25a1187d1cb2c795 100644 (file)

--- a/src/backend/parser/parse_utilcmd.c

+++ b/src/backend/parser/parse_utilcmd.c

@@ -4209,6 +4209,7 @@ transformPartitionBoundValue(ParseState *pstate, Node *val,

*/

if (!IsA(value, Const))

{

+ assign_expr_collations(pstate, value);

value = (Node *) expression_planner((Expr *) value);

value = (Node *) evaluate_expr((Expr *) value, colType, colTypmod,

partCollation);

diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out

index 8ed4fae934d0c4b83f7efc3400e54d2ce8816930..45f4a73447851536f588fe4caaa5d4f5f1e9b907 100644 (file)

--- a/src/test/regress/expected/create_table.out

+++ b/src/test/regress/expected/create_table.out

@@ -1014,6 +1014,13 @@ DETAIL: Failing row contains (1, null).

Partition of: parted_notnull_inh_test FOR VALUES IN (1)

drop table parted_notnull_inh_test;

+-- check that collations are assigned in partition bound expressions

+create table parted_boolean_col (a bool, b text) partition by list(a);

+create table parted_boolean_less partition of parted_boolean_col

+ for values in ('foo' < 'bar');

+create table parted_boolean_greater partition of parted_boolean_col

+ for values in ('foo' > 'bar');

+drop table parted_boolean_col;

-- check for a conflicting COLLATE clause

create table parted_collate_must_match (a text collate "C", b text collate "C")

partition by range (a);

diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql

index e6f0188a51898328709f7f9054b5b3b4cf298444..22602aae5d2a8a57216182aa1adf27991a46eb4a 100644 (file)

--- a/src/test/regress/sql/create_table.sql

+++ b/src/test/regress/sql/create_table.sql

@@ -801,6 +801,14 @@ insert into parted_notnull_inh_test (b) values (null);

\d parted_notnull_inh_test1

drop table parted_notnull_inh_test;

+-- check that collations are assigned in partition bound expressions

+create table parted_boolean_col (a bool, b text) partition by list(a);

+create table parted_boolean_less partition of parted_boolean_col

+ for values in ('foo' < 'bar');

+create table parted_boolean_greater partition of parted_boolean_col

+ for values in ('foo' > 'bar');

+drop table parted_boolean_col;

+

-- check for a conflicting COLLATE clause

create table parted_collate_must_match (a text collate "C", b text collate "C")

partition by range (a);

This is the main PostgreSQL git repository.