database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +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/nodes/copyfuncs.c
View File

@@ -2557,11 +2557,11 @@ _copyJsonExpr(const JsonExpr *from)
COPY_NODE_FIELD(result_coercion);
COPY_NODE_FIELD(format);
COPY_NODE_FIELD(path_spec);
COPY_NODE_FIELD(passing_values);
COPY_NODE_FIELD(passing_names);
COPY_NODE_FIELD(passing_values);
COPY_NODE_FIELD(returning);
COPY_NODE_FIELD(on_error);
COPY_NODE_FIELD(on_empty);
COPY_NODE_FIELD(on_error);
COPY_NODE_FIELD(coercions);
COPY_SCALAR_FIELD(wrapper);
COPY_SCALAR_FIELD(omit_quotes);
@@ -2637,8 +2637,8 @@ _copyJsonIsPredicate(const JsonIsPredicate *from)
JsonIsPredicate *newnode = makeNode(JsonIsPredicate);
COPY_NODE_FIELD(expr);
COPY_SCALAR_FIELD(format);
COPY_SCALAR_FIELD(value_type);
COPY_NODE_FIELD(format);
COPY_SCALAR_FIELD(item_type);
COPY_SCALAR_FIELD(unique_keys);
COPY_LOCATION_FIELD(location);
@@ -2764,6 +2764,7 @@ _copyJsonTableParent(const JsonTableParent *from)
COPY_SCALAR_FIELD(outerJoin);
COPY_SCALAR_FIELD(colMin);
COPY_SCALAR_FIELD(colMax);
COPY_SCALAR_FIELD(errorOnError);
return newnode;
}

8
src/backend/nodes/equalfuncs.c
View File

@@ -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);

4
src/backend/nodes/makefuncs.c
View File

@@ -927,14 +927,14 @@ makeJsonKeyValue(Node *key, Node *value)
* creates a JsonIsPredicate node
*/
Node *
makeJsonIsPredicate(Node *expr, JsonFormat *format, JsonValueType value_type,
makeJsonIsPredicate(Node *expr, JsonFormat *format, JsonValueType item_type,
bool unique_keys, int location)
{
JsonIsPredicate *n = makeNode(JsonIsPredicate);
n->expr = expr;
n->format = format;
n->value_type = value_type;
n->item_type = item_type;
n->unique_keys = unique_keys;
n->location = location;

16
src/backend/nodes/outfuncs.c
View File

@@ -1801,13 +1801,13 @@ _outJsonConstructorExpr(StringInfo str, const JsonConstructorExpr *node)
{
WRITE_NODE_TYPE("JSONCONSTRUCTOREXPR");
WRITE_ENUM_FIELD(type, JsonConstructorType);
WRITE_NODE_FIELD(args);
WRITE_NODE_FIELD(func);
WRITE_NODE_FIELD(coercion);
WRITE_ENUM_FIELD(type, JsonConstructorType);
WRITE_NODE_FIELD(returning);
WRITE_BOOL_FIELD(unique);
WRITE_BOOL_FIELD(absent_on_null);
WRITE_BOOL_FIELD(unique);
WRITE_LOCATION_FIELD(location);
}
@@ -1817,7 +1817,8 @@ _outJsonIsPredicate(StringInfo str, const JsonIsPredicate *node)
WRITE_NODE_TYPE("JSONISPREDICATE");
WRITE_NODE_FIELD(expr);
WRITE_ENUM_FIELD(value_type, JsonValueType);
WRITE_NODE_FIELD(format);
WRITE_ENUM_FIELD(item_type, JsonValueType);
WRITE_BOOL_FIELD(unique_keys);
WRITE_LOCATION_FIELD(location);
}
@@ -1841,11 +1842,11 @@ _outJsonExpr(StringInfo str, const JsonExpr *node)
WRITE_NODE_FIELD(result_coercion);
WRITE_NODE_FIELD(format);
WRITE_NODE_FIELD(path_spec);
WRITE_NODE_FIELD(passing_values);
WRITE_NODE_FIELD(passing_names);
WRITE_NODE_FIELD(passing_values);
WRITE_NODE_FIELD(returning);
WRITE_NODE_FIELD(on_error);
WRITE_NODE_FIELD(on_empty);
WRITE_NODE_FIELD(on_error);
WRITE_NODE_FIELD(coercions);
WRITE_ENUM_FIELD(wrapper, JsonWrapper);
WRITE_BOOL_FIELD(omit_quotes);
@@ -1883,7 +1884,7 @@ _outJsonItemCoercions(StringInfo str, const JsonItemCoercions *node)
static void
_outJsonTableParent(StringInfo str, const JsonTableParent *node)
{
WRITE_NODE_TYPE("JSONTABPNODE");
WRITE_NODE_TYPE("JSONTABLEPARENT");
WRITE_NODE_FIELD(path);
WRITE_STRING_FIELD(name);
@@ -1891,12 +1892,13 @@ _outJsonTableParent(StringInfo str, const JsonTableParent *node)
WRITE_BOOL_FIELD(outerJoin);
WRITE_INT_FIELD(colMin);
WRITE_INT_FIELD(colMax);
WRITE_BOOL_FIELD(errorOnError);
}
static void
_outJsonTableSibling(StringInfo str, const JsonTableSibling *node)
{
WRITE_NODE_TYPE("JSONTABSNODE");
WRITE_NODE_TYPE("JSONTABLESIBLING");
WRITE_NODE_FIELD(larg);
WRITE_NODE_FIELD(rarg);

16
src/backend/nodes/readfuncs.c
View File

@@ -1484,13 +1484,13 @@ _readJsonConstructorExpr(void)
{
READ_LOCALS(JsonConstructorExpr);
READ_ENUM_FIELD(type, JsonConstructorType);
READ_NODE_FIELD(args);
READ_NODE_FIELD(func);
READ_NODE_FIELD(coercion);
READ_INT_FIELD(type);
READ_NODE_FIELD(returning);
READ_BOOL_FIELD(unique);
READ_BOOL_FIELD(absent_on_null);
READ_BOOL_FIELD(unique);
READ_LOCATION_FIELD(location);
READ_DONE();
@@ -1523,11 +1523,11 @@ _readJsonExpr(void)
READ_NODE_FIELD(result_coercion);
READ_NODE_FIELD(format);
READ_NODE_FIELD(path_spec);
READ_NODE_FIELD(passing_values);
READ_NODE_FIELD(passing_names);
READ_NODE_FIELD(passing_values);
READ_NODE_FIELD(returning);
READ_NODE_FIELD(on_error);
READ_NODE_FIELD(on_empty);
READ_NODE_FIELD(on_error);
READ_NODE_FIELD(coercions);
READ_ENUM_FIELD(wrapper, JsonWrapper);
READ_BOOL_FIELD(omit_quotes);
@@ -1547,6 +1547,7 @@ _readJsonTableParent(void)
READ_BOOL_FIELD(outerJoin);
READ_INT_FIELD(colMin);
READ_INT_FIELD(colMax);
READ_BOOL_FIELD(errorOnError);
READ_DONE();
}
@@ -1610,7 +1611,8 @@ _readJsonIsPredicate()
READ_LOCALS(JsonIsPredicate);
READ_NODE_FIELD(expr);
READ_ENUM_FIELD(value_type, JsonValueType);
READ_NODE_FIELD(format);
READ_ENUM_FIELD(item_type, JsonValueType);
READ_BOOL_FIELD(unique_keys);
READ_LOCATION_FIELD(location);
@@ -3229,9 +3231,9 @@ parseNodeString(void)
return_value = _readJsonCoercion();
else if (MATCH("JSONITEMCOERCIONS", 17))
return_value = _readJsonItemCoercions();
else if (MATCH("JSONTABPNODE", 12))
else if (MATCH("JSONTABLEPARENT", 15))
return_value = _readJsonTableParent();
else if (MATCH("JSONTABSNODE", 12))
else if (MATCH("JSONTABLESIBLING", 16))
return_value = _readJsonTableSibling();
else
{