diff options
| author | Michael Paquier <michael@paquier.xyz> | 2020-04-08 15:04:51 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2020-04-08 15:04:51 +0900 |
| commit | c0187869a0f6eb05135d388462522a593ced1b88 (patch) | |
| tree | 2b1dca68b6114207671033836266f4c2874b2a08 /src/backend/parser/parse_utilcmd.c | |
| parent | d025cf88ba5a64487ee4a17ef23e8f55b1536606 (diff) | |
| download | postgresql-c0187869a0f6eb05135d388462522a593ced1b88.tar.gz postgresql-c0187869a0f6eb05135d388462522a593ced1b88.zip | |
Fix crash when using COLLATE in partition bound expressions
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
Diffstat (limited to 'src/backend/parser/parse_utilcmd.c')
| -rw-r--r-- | src/backend/parser/parse_utilcmd.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c index 2b9598c2dae..350959a5e0b 100644 --- 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) |