Fix deparsing of JSON_ARRAY(subquery) with a FORMAT clause

Commit 8d829f5a0 introduced the JSCTOR_JSON_ARRAY_QUERY constructor
type so that ruleutils.c could deparse JSON_ARRAY(subquery) using its
original syntax, storing the transformed subquery in a new orig_query
field.  However, the input FORMAT clause of JSON_ARRAY(subquery FORMAT
...) was not preserved for deparsing.  The format was recorded only in
the executable expression kept in the func field, which ruleutils.c
does not inspect, so it is silently dropped.

This is more than cosmetic, because FORMAT JSON changes the result:
without it a text value is treated as a string to be quoted, while
with it the value is treated as already-formatted JSON.

To fix, record the input FORMAT in a new deparse-only field of
JsonConstructorExpr, alongside orig_query, and emit it in ruleutils.c.

Bump catalog version.

Author: Chao Li <[email protected]>
Reviewed-by: Ewan Young <[email protected]>
Reviewed-by: Richard Guo <[email protected]>
Discussion: https://postgr.es/m/[email protected]
Backpatch-through: 19

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/f4c850d11afc60a4fc4bc782fc40d7b752bf8d7f

Modified Files
--------------
src/backend/parser/parse_expr.c       | 3 +++
src/backend/utils/adt/ruleutils.c     | 1 +
src/include/catalog/catversion.h      | 2 +-
src/include/nodes/primnodes.h         | 5 +++++
src/test/regress/expected/sqljson.out | 7 +++++++
src/test/regress/sql/sqljson.sql      | 8 ++++++++
6 files changed, 25 insertions(+), 1 deletion(-)

Reply via email to