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

git projects / postgresql.git / commitdiff

Fix crash when using COLLATE in partition bound expressions

author Michael Paquier <michael@paquier.xyz>

Wed, 8 Apr 2020 06:04:51 +0000 (15:04 +0900)

committer Michael Paquier <michael@paquier.xyz>

Wed, 8 Apr 2020 06:04:51 +0000 (15:04 +0900)

Attempting to use a COLLATE clause with a type that it not collatable in
a partition bound expression could crash the server. This commit fixes
the code by adding more checks similar to what is done when computing
index or partition attributes by making sure that there is a collation
iff the type is collatable.

Backpatch down to 12, as 7c079d7 introduced this problem.

Reported-by: Alexander Lakhin
Author: Dmitry Dolgov
Discussion: https://postgr.es/m/16325-809194cf742313ab@postgresql.org
Backpatch-through: 12

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 2b9598c2daef150007b2c198165c8ebe3a8113c7..350959a5e0bac3d59fbc2000b6ea64f153b1dcc5 100644 (file)

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

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

@@ -4081,6 +4081,30 @@ transformPartitionBoundValue(ParseState *pstate, Node *val,

{

Oid exprCollOid = exprCollation(value);

+ /*

+ * Check we have a collation iff it is a collatable type. The only

+ * expected failures here are (1) COLLATE applied to a noncollatable

+ * type, or (2) partition bound expression had an unresolved

+ * collation. But we might as well code this to be a complete

+ * consistency check.

+ */

+ if (type_is_collatable(colType))

+ {

+ if (!OidIsValid(exprCollOid))

+ ereport(ERROR,

+ (errcode(ERRCODE_INDETERMINATE_COLLATION),

+ errmsg("could not determine which collation to use for partition bound expression"),

+ errhint("Use the COLLATE clause to set the collation explicitly.")));

+ }

+ else

+ {

+ if (OidIsValid(exprCollOid))

+ ereport(ERROR,

+ (errcode(ERRCODE_DATATYPE_MISMATCH),

+ errmsg("collations are not supported by type %s",

+ format_type_be(colType))));

+ }

if (OidIsValid(exprCollOid) &&

exprCollOid != DEFAULT_COLLATION_OID &&

exprCollOid != partCollation)

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

index 6acf31725f84074e88c999ec0df233d6dedd888d..1c72f23bc93b82a4a8cb501581d2e272a58269b1 100644 (file)

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

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

@@ -652,6 +652,12 @@ CREATE TABLE part_bogus_expr_fail PARTITION OF list_parted FOR VALUES IN (genera

ERROR: set-returning functions are not allowed in partition bound

LINE 1: ...expr_fail PARTITION OF list_parted FOR VALUES IN (generate_s...

+CREATE TABLE part_bogus_expr_fail PARTITION OF list_parted FOR VALUES IN ('1' collate "POSIX");

+ERROR: collations are not supported by type integer

+CREATE TABLE part_bogus_expr_fail PARTITION OF list_parted FOR VALUES IN ((1+1) collate "POSIX");

+ERROR: collations are not supported by type integer

+LINE 1: ...ail PARTITION OF list_parted FOR VALUES IN ((1+1) collate "P...

+ ^

-- syntax does not allow empty list of values for list partitions

CREATE TABLE fail_part PARTITION OF list_parted FOR VALUES IN ();

ERROR: syntax error at or near ")"

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

index a670438c485e9863ac2beafb875242f12c7c09ef..9b1adcb8adda942c8903ab06919d3be36a86d71d 100644 (file)

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

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

@@ -549,6 +549,8 @@ CREATE TABLE part_bogus_expr_fail PARTITION OF list_parted FOR VALUES IN (sum(so

CREATE TABLE part_bogus_expr_fail PARTITION OF list_parted FOR VALUES IN (sum(1));

CREATE TABLE part_bogus_expr_fail PARTITION OF list_parted FOR VALUES IN ((select 1));

CREATE TABLE part_bogus_expr_fail PARTITION OF list_parted FOR VALUES IN (generate_series(4, 6));

+CREATE TABLE part_bogus_expr_fail PARTITION OF list_parted FOR VALUES IN ('1' collate "POSIX");

+CREATE TABLE part_bogus_expr_fail PARTITION OF list_parted FOR VALUES IN ((1+1) collate "POSIX");

-- syntax does not allow empty list of values for list partitions

CREATE TABLE fail_part PARTITION OF list_parted FOR VALUES IN ();

This is the main PostgreSQL git repository.

RSS Atom