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/nodes/equalfuncs.c | |
| parent | 2454cb07eed1ec7e68b9953b03d473d3c334ba05 (diff) | |
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/nodes/equalfuncs.c')
| -rw-r--r-- | src/backend/nodes/equalfuncs.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index 9688b22a4b9..e747e1667d0 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -186,6 +186,7 @@ _equalJsonTableParent(const JsonTableParent *a, const JsonTableParent *b) COMPARE_SCALAR_FIELD(outerJoin); COMPARE_SCALAR_FIELD(colMin); COMPARE_SCALAR_FIELD(colMax); + COMPARE_SCALAR_FIELD(errorOnError); return true; } @@ -1104,7 +1105,8 @@ _equalJsonIsPredicate(const JsonIsPredicate *a, const JsonIsPredicate *b) { COMPARE_NODE_FIELD(expr); - COMPARE_SCALAR_FIELD(value_type); + COMPARE_NODE_FIELD(format); + COMPARE_SCALAR_FIELD(item_type); COMPARE_SCALAR_FIELD(unique_keys); COMPARE_LOCATION_FIELD(location); @@ -1134,11 +1136,11 @@ _equalJsonExpr(const JsonExpr *a, const JsonExpr *b) COMPARE_NODE_FIELD(result_coercion); COMPARE_NODE_FIELD(format); COMPARE_NODE_FIELD(path_spec); - COMPARE_NODE_FIELD(passing_values); COMPARE_NODE_FIELD(passing_names); + COMPARE_NODE_FIELD(passing_values); COMPARE_NODE_FIELD(returning); - COMPARE_NODE_FIELD(on_error); COMPARE_NODE_FIELD(on_empty); + COMPARE_NODE_FIELD(on_error); COMPARE_NODE_FIELD(coercions); COMPARE_SCALAR_FIELD(wrapper); COMPARE_SCALAR_FIELD(omit_quotes); |