diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2022-05-13 11:40:01 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2022-05-13 11:40:08 -0400 |
| commit | 3ab9a63cb638a1fd99475668e2da9c237495aeda (patch) | |
| tree | fac93993a8a296e02fd12a4b222887f0d6b7d38e /src/backend/executor | |
| parent | 2454cb07eed1ec7e68b9953b03d473d3c334ba05 (diff) | |
| download | postgresql-3ab9a63cb638a1fd99475668e2da9c237495aeda.tar.gz postgresql-3ab9a63cb638a1fd99475668e2da9c237495aeda.zip | |
Rename JsonIsPredicate.value_type, fix JSON backend/nodes/ infrastructure.
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
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/execExprInterp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c index e024611aa54..e44ad68cda1 100644 --- a/src/backend/executor/execExprInterp.c +++ b/src/backend/executor/execExprInterp.c @@ -3952,24 +3952,24 @@ ExecEvalJsonIsPredicate(ExprState *state, ExprEvalStep *op) { text *json = DatumGetTextP(js); - if (pred->value_type == JS_TYPE_ANY) + if (pred->item_type == JS_TYPE_ANY) res = true; else { switch (json_get_first_token(json, false)) { case JSON_TOKEN_OBJECT_START: - res = pred->value_type == JS_TYPE_OBJECT; + res = pred->item_type == JS_TYPE_OBJECT; break; case JSON_TOKEN_ARRAY_START: - res = pred->value_type == JS_TYPE_ARRAY; + res = pred->item_type == JS_TYPE_ARRAY; break; case JSON_TOKEN_STRING: case JSON_TOKEN_NUMBER: case JSON_TOKEN_TRUE: case JSON_TOKEN_FALSE: case JSON_TOKEN_NULL: - res = pred->value_type == JS_TYPE_SCALAR; + res = pred->item_type == JS_TYPE_SCALAR; break; default: res = false; @@ -3986,13 +3986,13 @@ ExecEvalJsonIsPredicate(ExprState *state, ExprEvalStep *op) } else if (exprtype == JSONBOID) { - if (pred->value_type == JS_TYPE_ANY) + if (pred->item_type == JS_TYPE_ANY) res = true; else { Jsonb *jb = DatumGetJsonbP(js); - switch (pred->value_type) + switch (pred->item_type) { case JS_TYPE_OBJECT: res = JB_ROOT_IS_OBJECT(jb); |