diff options
| author | Amit Langote <amitlan@postgresql.org> | 2024-06-19 15:22:59 +0900 |
|---|---|---|
| committer | Amit Langote <amitlan@postgresql.org> | 2024-06-19 15:22:59 +0900 |
| commit | 03ec203164119f11f0eab4c83c97a8527e2b108d (patch) | |
| tree | 61ea3e4479ce1b3cda02263fd6bc474c4d9b991a /src/backend/parser/parse_expr.c | |
| parent | 0f271e8e8d9c8db0ea86c0d12b3221009b81d8bf (diff) | |
| download | postgresql-03ec203164119f11f0eab4c83c97a8527e2b108d.tar.gz postgresql-03ec203164119f11f0eab4c83c97a8527e2b108d.zip | |
SQL/JSON: Correctly enforce the default ON EMPTY behavior
Currently, when the ON EMPTY clause is not present, the ON ERROR
clause (implicit or explicit) dictates the behavior when jsonpath
evaluation in ExecEvalJsonExprPath() results in an empty sequence.
That is an oversight in the commit 6185c9737c.
This commit fixes things so that a NULL is returned instead in that
case which is the default behavior when the ON EMPTY clause is not
present.
Reported-by: Markus Winand
Discussion: https://postgr.es/m/F7DD1442-265C-4220-A603-CB0DEB77E91D%40winand.at
Diffstat (limited to 'src/backend/parser/parse_expr.c')
| -rw-r--r-- | src/backend/parser/parse_expr.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 4c95986c312..00cd7358ebb 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -4418,11 +4418,11 @@ transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func) coerceJsonExprOutput(pstate, jsexpr); - if (func->on_empty) - jsexpr->on_empty = transformJsonBehavior(pstate, - func->on_empty, - JSON_BEHAVIOR_NULL, - jsexpr->returning); + /* Assume NULL ON EMPTY when ON EMPTY is not specified. */ + jsexpr->on_empty = transformJsonBehavior(pstate, func->on_empty, + JSON_BEHAVIOR_NULL, + jsexpr->returning); + /* Assume NULL ON ERROR when ON ERROR is not specified. */ jsexpr->on_error = transformJsonBehavior(pstate, func->on_error, JSON_BEHAVIOR_NULL, jsexpr->returning); @@ -4448,11 +4448,11 @@ transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func) coerceJsonExprOutput(pstate, jsexpr); - if (func->on_empty) - jsexpr->on_empty = transformJsonBehavior(pstate, - func->on_empty, - JSON_BEHAVIOR_NULL, - jsexpr->returning); + /* Assume NULL ON EMPTY when ON EMPTY is not specified. */ + jsexpr->on_empty = transformJsonBehavior(pstate, func->on_empty, + JSON_BEHAVIOR_NULL, + jsexpr->returning); + /* Assume NULL ON ERROR when ON ERROR is not specified. */ jsexpr->on_error = transformJsonBehavior(pstate, func->on_error, JSON_BEHAVIOR_NULL, jsexpr->returning); @@ -4464,6 +4464,13 @@ transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func) jsexpr->returning->typid = exprType(jsexpr->formatted_expr); jsexpr->returning->typmod = -1; } + + /* + * Assume EMPTY ON ERROR when ON ERROR is not specified. + * + * ON EMPTY cannot be specified at the top level but it can be for + * the individual columns. + */ jsexpr->on_error = transformJsonBehavior(pstate, func->on_error, JSON_BEHAVIOR_EMPTY, jsexpr->returning); |