database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-27 23:21:58 +03:00
Code Activity

Rename JsonIsPredicate.value_type, fix JSON backend/nodes/ infrastructure.

Browse Source 
I started out with the intention to rename value_type to item_type to
avoid a collision with a typedef name that appears on some platforms.

Along the way, I noticed that the adjacent field "format" was not being
correctly handled by the backend/nodes/ infrastructure functions:
copyfuncs.c erroneously treated it as a scalar, while equalfuncs,
outfuncs, and readfuncs omitted handling it at all.  This looks like
it might be cosmetic at the moment because the field is always NULL
after parse analysis; but that's likely a bug in itself, and the code's
certainly not very future-proof.  Let's fix it while we can still do so
without forcing an initdb on beta testers.

Further study found a few other inconsistencies in the backend/nodes/
infrastructure for the recently-added JSON node types, so fix those too.

catversion bumped because of potential change in stored rules.

Discussion: https://postgr.es/m/526703.1652385613@sss.pgh.pa.us
This commit is contained in:
Tom Lane
2022-05-13 11:40:01 -04:00
parent 2454cb07ee
commit 3ab9a63cb6
12 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/parser/parse_expr.c
View File

@ -4018,8 +4018,7 @@ transformJsonParseArg(ParseState *pstate, Node *jsexpr, JsonFormat *format,
}
/*
* Transform IS JSON predicate into
* json[b]_is_valid(json, value_type [, check_key_uniqueness]) call.
* Transform IS JSON predicate.
*/
static Node *
transformJsonIsPredicate(ParseState *pstate, JsonIsPredicate *pred)
@ -4035,7 +4034,8 @@ transformJsonIsPredicate(ParseState *pstate, JsonIsPredicate *pred)
errmsg("cannot use type %s in IS JSON predicate",
format_type_be(exprtype))));
return makeJsonIsPredicate(expr, NULL, pred->value_type,
/* This intentionally(?) drops the format clause. */
return makeJsonIsPredicate(expr, NULL, pred->item_type,
pred->unique_keys, pred->location);
}