database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-07 19:06:32 +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

9
src/backend/utils/misc/queryjumble.c
View File

@@ -741,7 +741,7 @@ JumbleExpr(JumbleState *jstate, Node *node)
{
JsonFormat *format = (JsonFormat *) node;
APP_JUMB(format->type);
APP_JUMB(format->format_type);
APP_JUMB(format->encoding);
}
break;
@@ -767,12 +767,13 @@ JumbleExpr(JumbleState *jstate, Node *node)
{
JsonConstructorExpr *ctor = (JsonConstructorExpr *) node;
APP_JUMB(ctor->type);
JumbleExpr(jstate, (Node *) ctor->args);
JumbleExpr(jstate, (Node *) ctor->func);
JumbleExpr(jstate, (Node *) ctor->coercion);
JumbleExpr(jstate, (Node *) ctor->returning);
APP_JUMB(ctor->type);
APP_JUMB(ctor->unique);
APP_JUMB(ctor->absent_on_null);
APP_JUMB(ctor->unique);
}
break;
case T_JsonIsPredicate:
@@ -781,8 +782,8 @@ JumbleExpr(JumbleState *jstate, Node *node)
JumbleExpr(jstate, (Node *) pred->expr);
JumbleExpr(jstate, (Node *) pred->format);
APP_JUMB(pred->item_type);
APP_JUMB(pred->unique_keys);
APP_JUMB(pred->value_type);
}
break;
case T_JsonExpr: