mirror of
https://github.com/postgres/postgres.git
synced 2025-10-16 17:07:43 +03:00
Fix internal error from CollateExpr in SQL/JSON DEFAULT expressions
SQL/JSON functions such as JSON_VALUE could fail with "unrecognized node type" errors when a DEFAULT clause contained an explicit COLLATE expression. That happened because assign_collations_walker() could invoke exprSetCollation() on a JsonBehavior expression whose DEFAULT still contained a CollateExpr, which exprSetCollation() does not handle. For example: SELECT JSON_VALUE('{"a":1}', '$.c' RETURNING text DEFAULT 'A' COLLATE "C" ON EMPTY); Fix by validating in transformJsonBehavior() that the DEFAULT expression's collation matches the enclosing JSON expression’s collation. In exprSetCollation(), replace the recursive call on the JsonBehavior expression with an assertion that its collation already matches the target, since the parser now enforces that condition. Reported-by: Jian He <jian.universality@gmail.com> Author: Jian He <jian.universality@gmail.com> Reviewed-by: Amit Langote <amitlangote09@gmail.com> Discussion: https://postgr.es/m/CACJufxHVwYYSyiVQ6o+PsRX6zQ7rAFinh_fv1kCfTsT1xG4Zeg@mail.gmail.com Backpatch-through: 17
This commit is contained in:
@@ -1274,12 +1274,8 @@ exprSetCollation(Node *expr, Oid collation)
|
||||
}
|
||||
break;
|
||||
case T_JsonBehavior:
|
||||
{
|
||||
JsonBehavior *behavior = (JsonBehavior *) expr;
|
||||
|
||||
if (behavior->expr)
|
||||
exprSetCollation(behavior->expr, collation);
|
||||
}
|
||||
Assert(((JsonBehavior *) expr)->expr == NULL ||
|
||||
exprCollation(((JsonBehavior *) expr)->expr) == collation);
|
||||
break;
|
||||
case T_NullTest:
|
||||
/* NullTest's result is boolean ... */
|
||||
|
Reference in New Issue
Block a user