Add node functtion for JsonFomat and JsonReturning

Author: Nikita Glukhov

src/backend/nodes/copyfuncs.c

@@ -2248,6 +2248,37 @@ _copyOnConflictExpr(const OnConflictExpr *from)
 	return newnode;
 }
 
+
+/*
+ * _copyJsonFormat
+ */
+static JsonFormat *
+_copyJsonFormat(const JsonFormat *from)
+{
+	JsonFormat *newnode = makeNode(JsonFormat);
+
+	COPY_SCALAR_FIELD(format);
+	COPY_SCALAR_FIELD(encoding);
+	COPY_LOCATION_FIELD(location);
+
+	return newnode;
+}
+
+/*
+ * _copyJsonReturning
+ */
+static JsonReturning *
+_copyJsonReturning(const JsonReturning *from)
+{
+	JsonReturning *newnode = makeNode(JsonReturning);
+
+	COPY_NODE_FIELD(format);
+	COPY_SCALAR_FIELD(typid);
+	COPY_SCALAR_FIELD(typmod);
+
+	return newnode;
+}
+
 /*
  * _copyJsonValueExpr
  */
@@ -2258,7 +2289,7 @@ _copyJsonValueExpr(const JsonValueExpr *from)
 
 	COPY_NODE_FIELD(raw_expr);
 	COPY_NODE_FIELD(formatted_expr);
-	COPY_SCALAR_FIELD(format);
+	COPY_NODE_FIELD(format);
 
 	return newnode;
 }
@@ -5160,6 +5191,12 @@ copyObjectImpl(const void *from)
 		case T_OnConflictExpr:
 			retval = _copyOnConflictExpr(from);
 			break;
+		case T_JsonFormat:
+			retval = _copyJsonFormat(from);
+			break;
+		case T_JsonReturning:
+			retval = _copyJsonReturning(from);
+			break;
 		case T_JsonValueExpr:
 			retval = _copyJsonValueExpr(from);
 			break;

src/backend/nodes/equalfuncs.c

@@ -818,14 +818,32 @@ _equalOnConflictExpr(const OnConflictExpr *a, const OnConflictExpr *b)
 	return true;
 }
 
+static bool
+_equalJsonFormat(const JsonFormat *a, const JsonFormat *b)
+{
+	COMPARE_SCALAR_FIELD(format);
+	COMPARE_SCALAR_FIELD(encoding);
+	COMPARE_LOCATION_FIELD(location);
+
+	return true;
+}
+
+static bool
+_equalJsonReturning(const JsonReturning *a, const JsonReturning *b)
+{
+	COMPARE_NODE_FIELD(format);
+	COMPARE_SCALAR_FIELD(typid);
+	COMPARE_SCALAR_FIELD(typmod);
+
+	return true;
+}
+
 static bool
 _equalJsonValueExpr(const JsonValueExpr *a, const JsonValueExpr *b)
 {
 	COMPARE_NODE_FIELD(raw_expr);
 	COMPARE_NODE_FIELD(formatted_expr);
-	COMPARE_SCALAR_FIELD(format.type);
-	COMPARE_SCALAR_FIELD(format.encoding);
-	COMPARE_LOCATION_FIELD(format.location);
+	COMPARE_NODE_FIELD(format);
 
 	return true;
 }
@@ -3222,6 +3240,12 @@ equal(const void *a, const void *b)
 		case T_JoinExpr:
 			retval = _equalJoinExpr(a, b);
 			break;
+		case T_JsonFormat:
+			retval = _equalJsonFormat(a, b);
+			break;
+		case T_JsonReturning:
+			retval = _equalJsonReturning(a, b);
+			break;
 		case T_JsonValueExpr:
 			retval = _equalJsonValueExpr(a, b);
 			break;

src/backend/nodes/nodeFuncs.c

@@ -2604,6 +2604,7 @@ expression_tree_mutator(Node *node,
 		case T_NextValueExpr:
 		case T_RangeTblRef:
 		case T_SortGroupClause:
+		case T_JsonFormat:
 			return (Node *) copyObject(node);
 		case T_WithCheckOption:
 			{
@@ -3198,6 +3199,16 @@ expression_tree_mutator(Node *node,
 				return (Node *) newnode;
 			}
 			break;
+		case T_JsonReturning:
+			{
+				JsonReturning *jr = (JsonReturning *) node;
+				JsonReturning *newnode;
+
+				FLATCOPY(newnode, jr, JsonReturning);
+				MUTATE(newnode->format, jr->format, JsonFormat *);
+
+				return (Node *) newnode;
+			}
 		case T_JsonValueExpr:
 			{
 				JsonValueExpr *jve = (JsonValueExpr *) node;
@@ -3206,6 +3217,7 @@ expression_tree_mutator(Node *node,
 				FLATCOPY(newnode, jve, JsonValueExpr);
 				MUTATE(newnode->raw_expr, jve->raw_expr, Expr *);
 				MUTATE(newnode->formatted_expr, jve->formatted_expr, Expr *);
+				MUTATE(newnode->format, jve->format, JsonFormat *);
 
 				return (Node *) newnode;
 			}
@@ -3904,6 +3916,8 @@ raw_expression_tree_walker(Node *node,
 			break;
 		case T_CommonTableExpr:
 			return walker(((CommonTableExpr *) node)->ctequery, context);
+		case T_JsonReturning:
+			return walker(((JsonReturning *) node)->format, context);
 		case T_JsonValueExpr:
 			{
 				JsonValueExpr *jve = (JsonValueExpr *) node;
@@ -3912,6 +3926,8 @@ raw_expression_tree_walker(Node *node,
 					return true;
 				if (walker(jve->formatted_expr, context))
 					return true;
+				if (walker(jve->format, context))
+					return true;
 			}
 			break;
 		default:

src/backend/nodes/outfuncs.c

@@ -1709,16 +1709,34 @@ _outOnConflictExpr(StringInfo str, const OnConflictExpr *node)
 	WRITE_NODE_FIELD(exclRelTlist);
 }
 
+static void
+_outJsonFormat(StringInfo str, const JsonFormat *node)
+{
+	WRITE_NODE_TYPE("JSONFORMAT");
+
+	WRITE_ENUM_FIELD(format, JsonFormatType);
+	WRITE_ENUM_FIELD(encoding, JsonEncoding);
+	WRITE_LOCATION_FIELD(location);
+}
+
+static void
+_outJsonReturning(StringInfo str, const JsonReturning *node)
+{
+	WRITE_NODE_TYPE("JSONRETURNING");
+
+	WRITE_NODE_FIELD(format);
+	WRITE_OID_FIELD(typid);
+	WRITE_INT_FIELD(typmod);
+}
+
 static void
 _outJsonValueExpr(StringInfo str, const JsonValueExpr *node)
 {
 	WRITE_NODE_TYPE("JSONVALUEEXPR");
 
 	WRITE_NODE_FIELD(raw_expr);
 	WRITE_NODE_FIELD(formatted_expr);
-	WRITE_ENUM_FIELD(format.type, JsonFormatType);
-	WRITE_ENUM_FIELD(format.encoding, JsonEncoding);
-	WRITE_LOCATION_FIELD(format.location);
+	WRITE_NODE_FIELD(format);
 }
 
 /*****************************************************************************
@@ -4349,6 +4367,12 @@ outNode(StringInfo str, const void *obj)
 			case T_PartitionRangeDatum:
 				_outPartitionRangeDatum(str, obj);
 				break;
+			case T_JsonFormat:
+				_outJsonFormat(str, obj);
+				break;
+			case T_JsonReturning:
+				_outJsonReturning(str, obj);
+				break;
 			case T_JsonValueExpr:
 				_outJsonValueExpr(str, obj);
 				break;

src/backend/nodes/readfuncs.c

@@ -1343,6 +1343,36 @@ _readOnConflictExpr(void)
 	READ_DONE();
 }
 
+/*
+ * _readJsonFormat
+ */
+static JsonFormat *
+_readJsonFormat(void)
+{
+	READ_LOCALS(JsonFormat);
+
+	READ_ENUM_FIELD(format, JsonFormatType);
+	READ_ENUM_FIELD(encoding, JsonEncoding);
+	READ_LOCATION_FIELD(location);
+
+	READ_DONE();
+}
+
+/*
+ * _readJsonReturning
+ */
+static JsonReturning *
+_readJsonReturning(void)
+{
+	READ_LOCALS(JsonReturning);
+
+	READ_NODE_FIELD(format);
+	READ_OID_FIELD(typid);
+	READ_INT_FIELD(typmod);
+
+	READ_DONE();
+}
+
 /*
  * _readJsonValueExpr
  */
@@ -1353,9 +1383,7 @@ _readJsonValueExpr(void)
 
 	READ_NODE_FIELD(raw_expr);
 	READ_NODE_FIELD(formatted_expr);
-	READ_ENUM_FIELD(format.type, JsonFormatType);
-	READ_ENUM_FIELD(format.encoding, JsonEncoding);
-	READ_LOCATION_FIELD(format.location);
+	READ_NODE_FIELD(format);
 
 	READ_DONE();
 }
@@ -2897,6 +2925,10 @@ parseNodeString(void)
 		return_value = _readPartitionBoundSpec();
 	else if (MATCH("PARTITIONRANGEDATUM", 19))
 		return_value = _readPartitionRangeDatum();
+	else if (MATCH("JSONFORMAT", 10))
+		return_value = _readJsonFormat();
+	else if (MATCH("JSONRETURNING", 13))
+		return_value = _readJsonReturning();
 	else if (MATCH("JSONVALUEEXPR", 13))
 		return_value = _readJsonValueExpr();
 	else