Ruleutils_17 SQL/JSON: Fix JSON_TABLE() column deparsing

Relevant PG commit:
c88ce386c4
c88ce386c4d7bfeb437ff31ec7c23c392c862e77
pull/7725/head
naisila 2024-11-10 23:48:20 +03:00
parent 897d996b8f
commit b988af3c35
1 changed files with 4 additions and 4 deletions

View File

@ -8495,7 +8495,6 @@ get_json_table_columns(TableFunc *tf, JsonTablePathScan *scan,
bool showimplicit) bool showimplicit)
{ {
StringInfo buf = context->buf; StringInfo buf = context->buf;
JsonExpr *jexpr = castNode(JsonExpr, tf->docexpr);
ListCell *lc_colname; ListCell *lc_colname;
ListCell *lc_coltype; ListCell *lc_coltype;
ListCell *lc_coltypmod; ListCell *lc_coltypmod;
@ -8548,6 +8547,10 @@ get_json_table_columns(TableFunc *tf, JsonTablePathScan *scan,
if (ordinality) if (ordinality)
continue; continue;
/*
* Set default_behavior to guide get_json_expr_options() on whether to
* to emit the ON ERROR / EMPTY clauses.
*/
if (colexpr->op == JSON_EXISTS_OP) if (colexpr->op == JSON_EXISTS_OP)
{ {
appendStringInfoString(buf, " EXISTS"); appendStringInfoString(buf, " EXISTS");
@ -8571,9 +8574,6 @@ get_json_table_columns(TableFunc *tf, JsonTablePathScan *scan,
default_behavior = JSON_BEHAVIOR_NULL; default_behavior = JSON_BEHAVIOR_NULL;
} }
if (jexpr->on_error->btype == JSON_BEHAVIOR_ERROR)
default_behavior = JSON_BEHAVIOR_ERROR;
appendStringInfoString(buf, " PATH "); appendStringInfoString(buf, " PATH ");
get_json_path_spec(colexpr->path_spec, context, showimplicit); get_json_path_spec(colexpr->path_spec, context, showimplicit);