Use nodes JsonFomat and JsonReturning in JSON_TABLE

Nikita Glukhov · Nikita Glukhov · commit 81737360fc68 · 2020-07-29T20:40:51.000+03:00
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -15179,8 +15179,7 @@ json_table_regular_column_definition:
 					n->coltype = JTC_REGULAR;
 					n->name = $1;
 					n->typeName = $2;
-					n->format.type = JS_FORMAT_DEFAULT;
-					n->format.encoding = JS_ENC_DEFAULT;
+					n->format = makeJsonFormat(JS_FORMAT_DEFAULT, JS_ENC_DEFAULT, -1);
 					n->wrapper = JSW_NONE;
 					n->omit_quotes = false;
 					n->pathspec = $3;
@@ -15217,7 +15216,7 @@ json_table_formatted_column_definition:
 					n->coltype = JTC_FORMATTED;
 					n->name = $1;
 					n->typeName = $2;
-					n->format = $4;
+					n->format = castNode(JsonFormat, $4);
 					n->pathspec = $5;
 					n->wrapper = $6;
 					if (n->wrapper != JSW_NONE && $7 != JS_QUOTES_UNSPEC)
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
@@ -4912,13 +4912,12 @@ transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func)
 			break;
 
 		case IS_JSON_TABLE:
-			jsexpr->returning.format.type = JS_FORMAT_DEFAULT;
-			jsexpr->returning.format.encoding = JS_ENC_DEFAULT;
-			jsexpr->returning.format.location = -1;
-			jsexpr->returning.typid = exprType(contextItemExpr);
-			jsexpr->returning.typmod = -1;
+			jsexpr->returning = makeNode(JsonReturning);
+			jsexpr->returning->format = makeJsonFormat(JS_FORMAT_DEFAULT, JS_ENC_DEFAULT, -1);
+			jsexpr->returning->typid = exprType(contextItemExpr);
+			jsexpr->returning->typmod = -1;
 
-			if (jsexpr->returning.typid != JSONBOID)
+			if (jsexpr->returning->typid != JSONBOID)
 				ereport(ERROR,
 						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 						 errmsg("JSON_TABLE() is not yet implemented for json type"),
diff --git a/src/backend/parser/parse_jsontable.c b/src/backend/parser/parse_jsontable.c
@@ -70,7 +70,7 @@ transformJsonTableColumn(JsonTableColumn *jtc, Node *contextItemExpr,
 	JsonCommon *common = makeNode(JsonCommon);
 	JsonOutput *output = makeNode(JsonOutput);
 	JsonPathSpec pathspec;
-	JsonFormat	default_format;
+	JsonFormat *default_format;
 
 	jfexpr->op = jtc->coltype == JTC_REGULAR ? IS_JSON_VALUE : IS_JSON_QUERY;
 	jfexpr->common = common;
@@ -84,10 +84,10 @@ transformJsonTableColumn(JsonTableColumn *jtc, Node *contextItemExpr,
 	jfexpr->location = jtc->location;
 
 	output->typeName = jtc->typeName;
-	output->returning.format = jtc->format;
+	output->returning = makeNode(JsonReturning);
+	output->returning->format = jtc->format;
 
-	default_format.type = JS_FORMAT_DEFAULT;
-	default_format.encoding = JS_ENC_DEFAULT;
+	default_format = makeJsonFormat(JS_FORMAT_DEFAULT, JS_ENC_DEFAULT, -1);
 
 	common->pathname = NULL;
 	common->expr = makeJsonValueExpr((Expr *) contextItemExpr, default_format);
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
@@ -10496,7 +10496,7 @@ get_json_table_columns(TableFunc *tf, JsonTableParentNode *node,
 
 		if (colexpr->op == IS_JSON_QUERY)
 			appendStringInfoString(buf,
-								   colexpr->format.type == JS_FORMAT_JSONB ?
+								   colexpr->format->format == JS_FORMAT_JSONB ?
 								   " FORMAT JSONB" : " FORMAT JSON");
 
 		appendStringInfoString(buf, " PATH ");
@@ -10538,17 +10538,17 @@ get_json_table(TableFunc *tf, deparse_context *context, bool showimplicit)
 
 	get_rule_expr(jexpr->raw_expr, context, showimplicit);
 
-	if (jexpr->format.type != JS_FORMAT_DEFAULT)
+	if (jexpr->format->format != JS_FORMAT_DEFAULT)
 	{
 		appendStringInfoString(buf,
-							   jexpr->format.type == JS_FORMAT_JSONB ?
+							   jexpr->format->format == JS_FORMAT_JSONB ?
 								" FORMAT JSONB" : " FORMAT JSON");
 
-		if (jexpr->format.encoding != JS_ENC_DEFAULT)
+		if (jexpr->format->encoding != JS_ENC_DEFAULT)
 		{
 			const char *encoding =
-				jexpr->format.encoding == JS_ENC_UTF16 ? "UTF16" :
-				jexpr->format.encoding == JS_ENC_UTF32 ? "UTF32" :
+				jexpr->format->encoding == JS_ENC_UTF16 ? "UTF16" :
+				jexpr->format->encoding == JS_ENC_UTF32 ? "UTF32" :
 														 "UTF8";
 
 			appendStringInfo(buf, " ENCODING %s", encoding);
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
@@ -1581,7 +1581,7 @@ typedef struct JsonTableColumn
 	char	   *name;				/* column name */
 	TypeName   *typeName;			/* column type name */
 	JsonPathSpec pathspec;			/* path specification, if any */
-	JsonFormat	format;				/* JSON format clause, if specified */
+	JsonFormat *format;				/* JSON format clause, if specified */
 	JsonWrapper	wrapper;			/* WRAPPER behavior for formatted columns */
 	bool		omit_quotes;		/* omit or keep quotes on scalar strings? */
 	List	   *columns;			/* nested columns */
