Add nodes JsonFormat and JsonRetuning

Nikita Glukhov · Nikita Glukhov · commit ceb864a13a16 · 2020-07-29T15:47:14.000+03:00
diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c
@@ -816,12 +816,28 @@ makeVacuumRelation(RangeVar *relation, Oid oid, List *va_cols)
 	return v;
 }
 
+/*
+ * makeJsonFormat -
+ *	  creates a JsonFormat node
+ */
+JsonFormat *
+makeJsonFormat(JsonFormatType type, JsonEncoding encoding, int location)
+{
+	JsonFormat *jf = makeNode(JsonFormat);
+
+	jf->format = type;
+	jf->encoding = encoding;
+	jf->location = location;
+
+	return jf;
+}
+
 /*
  * makeJsonValueExpr -
  *	  creates a JsonValueExpr node
  */
 JsonValueExpr *
-makeJsonValueExpr(Expr *expr, JsonFormat format)
+makeJsonValueExpr(Expr *expr, JsonFormat *format)
 {
 	JsonValueExpr *jve = makeNode(JsonValueExpr);
 
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -220,7 +220,6 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 	JoinType			jtype;
 	DropBehavior		dbehavior;
 	OnCommitAction		oncommit;
-	JsonFormat			jsformat;
 	List				*list;
 	Node				*node;
 	Value				*value;
@@ -600,15 +599,14 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 %type <list>		hash_partbound
 %type <defelt>		hash_partbound_elem
 
-%type <node>		json_value_expr
+%type <node>		json_format_clause_opt
+					json_representation
+					json_value_expr
 					json_output_clause_opt
 
 %type <ival>		json_encoding
 					json_encoding_clause_opt
 
-%type <jsformat>	json_format_clause_opt
-					json_representation
-
 /*
  * Non-keyword token types.  These are hard-wired into the "flex" lexer.
  * They must be listed first so that their numeric codes do not depend on
@@ -14662,18 +14660,14 @@ json_format_clause_opt:
 				}
 			| /* EMPTY */
 				{
-					$$.type = JS_FORMAT_DEFAULT;
-					$$.encoding = JS_ENC_DEFAULT;
-					$$.location = -1;
+					$$ = (Node *) makeJsonFormat(JS_FORMAT_DEFAULT, JS_ENC_DEFAULT, -1);
 				}
 		;
 
 json_representation:
 			JSON json_encoding_clause_opt
 				{
-					$$.type = JS_FORMAT_JSON;
-					$$.encoding = $2;
-					$$.location = @1;
+					$$ = (Node *) makeJsonFormat(JS_FORMAT_JSON, $2, @1);
 				}
 		/*	| implementation_defined_JSON_representation_option (BSON, AVRO etc) */
 		;
diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h
@@ -105,7 +105,9 @@ extern GroupingSet *makeGroupingSet(GroupingSetKind kind, List *content, int loc
 
 extern VacuumRelation *makeVacuumRelation(RangeVar *relation, Oid oid, List *va_cols);
 
-extern JsonValueExpr *makeJsonValueExpr(Expr *expr, JsonFormat format);
+extern JsonFormat *makeJsonFormat(JsonFormatType type, JsonEncoding encoding,
+								  int location);
+extern JsonValueExpr *makeJsonValueExpr(Expr *expr, JsonFormat *format);
 extern JsonEncoding makeJsonEncoding(char *name);
 
 #endif							/* MAKEFUNC_H */
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
@@ -198,6 +198,9 @@ typedef enum NodeTag
 	T_FromExpr,
 	T_OnConflictExpr,
 	T_IntoClause,
+	T_JsonFormat,
+	T_JsonReturning,
+	T_JsonValueExpr,
 
 	/*
 	 * TAGS FOR EXPRESSION STATE NODES (execnodes.h)
@@ -481,7 +484,6 @@ typedef enum NodeTag
 	T_PartitionRangeDatum,
 	T_PartitionCmd,
 	T_VacuumRelation,
-	T_JsonValueExpr,
 	T_JsonOutput,
 
 	/*
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
@@ -1499,17 +1499,6 @@ typedef struct JsonOutput
 	JsonReturning returning;	/* RETURNING FORMAT clause and type Oids */
 } JsonOutput;
 
-/*
- * JsonValueExpr -
- *		representation of JSON value expression (expr [FORMAT json_format])
- */
-typedef struct JsonValueExpr
-{
-	NodeTag		type;
-	Expr	   *expr;			/* raw expression */
-	JsonFormat  format;			/* FORMAT clause, if specified */
-} JsonValueExpr;
-
 
 /*****************************************************************************
  *		Raw Grammar Output Statements
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
@@ -1218,9 +1218,10 @@ typedef enum JsonFormatType
  */
 typedef struct JsonFormat
 {
-	JsonFormatType	type;		/* format type */
-	JsonEncoding	encoding;	/* JSON encoding */
-	int				location;	/* token location, or -1 if unknown */
+	NodeTag		type;
+	JsonFormatType format;		/* format type */
+	JsonEncoding encoding;		/* JSON encoding */
+	int			location;		/* token location, or -1 if unknown */
 } JsonFormat;
 
 /*
@@ -1229,11 +1230,23 @@ typedef struct JsonFormat
  */
 typedef struct JsonReturning
 {
-	JsonFormat	format;			/* output JSON format */
+	NodeTag		type;
+	JsonFormat *format;			/* output JSON format */
 	Oid			typid;			/* target type Oid */
 	int32		typmod;			/* target type modifier */
 } JsonReturning;
 
+/*
+ * JsonValueExpr -
+ *		representation of JSON value expression (expr [FORMAT json_format])
+ */
+typedef struct JsonValueExpr
+{
+	NodeTag		type;
+	Expr	   *expr;			/* raw expression */
+	JsonFormat *format;			/* FORMAT clause, if specified */
+} JsonValueExpr;
+
 /* ----------------
  * NullTest
  *
