diff options
| author | Amit Langote | 2024-07-26 06:59:27 +0000 |
|---|---|---|
| committer | Amit Langote | 2024-07-26 07:00:06 +0000 |
| commit | 63e6c5f4a2eeb22e0dd446a62c2b4b417d2b51f0 (patch) | |
| tree | 3ce786dcf32d88140630721cf051c32dd61033fa /src/backend/executor/execExprInterp.c | |
| parent | c7301c3b6fe2feaf96d52cbf35a85ac6b95374dc (diff) | |
SQL/JSON: Fix error-handling of some JsonBehavior expressions
To ensure that the errors of executing a JsonBehavior expression that
is coerced in the parser are caught instead of being thrown directly,
pass ErrorSaveContext to ExecInitExprRec() when initializing it.
Also, add a EEOP_JSONEXPR_COERCION_FINISH step to handle the errors
that are caught that way.
Discussion: https://postgr.es/m/CACJufxEo4sUjKCYtda0_qt9tazqqKPmF1cqhW9KBOUeJFqQd2g@mail.gmail.com
Backpatch-through: 17
Diffstat (limited to 'src/backend/executor/execExprInterp.c')
| -rw-r--r-- | src/backend/executor/execExprInterp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c index d8735286c4d..4c9b2a8c178 100644 --- a/src/backend/executor/execExprInterp.c +++ b/src/backend/executor/execExprInterp.c @@ -4558,6 +4558,12 @@ ExecEvalJsonCoercionFinish(ExprState *state, ExprEvalStep *op) *op->resvalue = (Datum) 0; *op->resnull = true; jsestate->error.value = BoolGetDatum(true); + + /* + * Reset for next use such as for catching errors when coercing a + * JsonBehavior expression. + */ + jsestate->escontext.error_occurred = false; } } |