Use nodes JsonFomat and JsonReturning in JsonValueExpr

Nikita Glukhov · Nikita Glukhov · commit 502923b1bd30 · 2020-07-29T15:47:15.000+03:00
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -3086,14 +3086,30 @@ JumbleExpr(pgssJumbleState *jstate, Node *node)
 				JumbleExpr(jstate, (Node *) conf->exclRelTlist);
 			}
 			break;
+		case T_JsonFormat:
+			{
+				JsonFormat *format = (JsonFormat *) node;
+
+				APP_JUMB(format->type);
+				APP_JUMB(format->encoding);
+			}
+			break;
+		case T_JsonReturning:
+			{
+				JsonReturning *returning = (JsonReturning *) node;
+
+				JumbleExpr(jstate, (Node *) returning->format);
+				APP_JUMB(returning->typid);
+				APP_JUMB(returning->typmod);
+			}
+			break;
 		case T_JsonValueExpr:
 			{
 				JsonValueExpr *expr = (JsonValueExpr *) node;
 
 				JumbleExpr(jstate, (Node *) expr->raw_expr);
 				JumbleExpr(jstate, (Node *) expr->formatted_expr);
-				APP_JUMB(expr->format.type);
-				APP_JUMB(expr->format.encoding);
+				JumbleExpr(jstate, (Node *) expr->format);
 			}
 			break;
 		case T_List:
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
@@ -3584,7 +3584,7 @@ getJsonEncodingConst(JsonFormat *format)
 	Name		encname = palloc(sizeof(NameData));
 
 	if (!format ||
-		format->type == JS_FORMAT_DEFAULT ||
+		format->format == JS_FORMAT_DEFAULT ||
 		format->encoding == JS_ENC_DEFAULT)
 		encoding = JS_ENC_UTF8;
 	else
@@ -3620,7 +3620,7 @@ makeJsonByteaToTextConversion(Node *expr, JsonFormat *format, int location)
 	FuncExpr   *fexpr = makeFuncExpr(F_PG_CONVERT_FROM, TEXTOID,
 									 list_make2(expr, encoding),
 									 InvalidOid, InvalidOid,
-									 COERCE_INTERNAL_CAST);
+									 COERCE_EXPLICIT_CALL);
 
 	fexpr->location = location;
 
@@ -3667,13 +3667,13 @@ transformJsonValueExpr(ParseState *pstate, JsonValueExpr *ve,
 
 	get_type_category_preferred(exprtype, &typcategory, &typispreferred);
 
-	if (ve->format.type != JS_FORMAT_DEFAULT)
+	if (ve->format->format != JS_FORMAT_DEFAULT)
 	{
-		if (ve->format.encoding != JS_ENC_DEFAULT && exprtype != BYTEAOID)
+		if (ve->format->encoding != JS_ENC_DEFAULT && exprtype != BYTEAOID)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATATYPE_MISMATCH),
 					 errmsg("JSON ENCODING clause is only allowed for bytea input type"),
-					 parser_errposition(pstate, ve->format.location)));
+					 parser_errposition(pstate, ve->format->location)));
 
 		if (exprtype == JSONOID || exprtype == JSONBOID)
 		{
@@ -3683,7 +3683,7 @@ transformJsonValueExpr(ParseState *pstate, JsonValueExpr *ve,
 					 parser_errposition(pstate, ve->format->location)));
 		}
 		else
-			format = ve->format.type;
+			format = ve->format->format;
 	}
 	else if (exprtype == JSONOID || exprtype == JSONBOID)
 		format = JS_FORMAT_DEFAULT;	/* do not format json[b] types */
@@ -3701,16 +3701,16 @@ transformJsonValueExpr(ParseState *pstate, JsonValueExpr *ve,
 		if (exprtype != BYTEAOID && typcategory != TYPCATEGORY_STRING)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATATYPE_MISMATCH),
-					 errmsg(ve->format.type == JS_FORMAT_DEFAULT ?
+					 errmsg(ve->format->format == JS_FORMAT_DEFAULT ?
 							"cannot use non-string types with implicit FORMAT JSON clause" :
 							"cannot use non-string types with explicit FORMAT JSON clause"),
-					 parser_errposition(pstate, ve->format.location >= 0 ?
-										ve->format.location : location)));
+					 parser_errposition(pstate, ve->format->location >= 0 ?
+										ve->format->location : location)));
 
 		/* Convert encoded JSON text from bytea. */
 		if (format == JS_FORMAT_JSON && exprtype == BYTEAOID)
 		{
-			expr = makeJsonByteaToTextConversion(expr, &ve->format, location);
+			expr = makeJsonByteaToTextConversion(expr, ve->format, location);
 			exprtype = TEXTOID;
 		}
 
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
@@ -7899,16 +7899,16 @@ get_rule_expr_paren(Node *node, deparse_context *context,
 }
 
 /*
- * get_json_format			- Parse back a JsonFormat structure
+ * get_json_format			- Parse back a JsonFormat node
  */
 static void
 get_json_format(JsonFormat *format, deparse_context *context)
 {
-	if (format->type == JS_FORMAT_DEFAULT)
+	if (format->format == JS_FORMAT_DEFAULT)
 		return;
 
 	appendStringInfoString(context->buf,
-						   format->type == JS_FORMAT_JSONB ?
+						   format->format == JS_FORMAT_JSONB ?
 						   " FORMAT JSONB" : " FORMAT JSON");
 
 	if (format->encoding != JS_ENC_DEFAULT)
@@ -7936,9 +7936,9 @@ get_json_returning(JsonReturning *returning, deparse_context *context,
 											  returning->typmod));
 
 	if (!json_format_by_default ||
-		returning->format.type !=
+		returning->format->format !=
 			(returning->typid == JSONBOID ? JS_FORMAT_JSONB : JS_FORMAT_JSON))
-		get_json_format(&returning->format, context);
+		get_json_format(returning->format, context);
 }
 
 /* ----------
@@ -9118,7 +9118,7 @@ get_rule_expr(Node *node, deparse_context *context,
 				JsonValueExpr *jve = (JsonValueExpr *) node;
 
 				get_rule_expr((Node *) jve->raw_expr, context, false);
-				get_json_format(&jve->format, context);
+				get_json_format(jve->format, context);
 			}
 			break;
 
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
@@ -1243,7 +1243,8 @@ typedef struct JsonReturning
 typedef struct JsonValueExpr
 {
 	NodeTag		type;
-	Expr	   *expr;			/* raw expression */
+	Expr	   *raw_expr;		/* raw expression */
+	Expr	   *formatted_expr;	/* formatted expression or NULL */
 	JsonFormat *format;			/* FORMAT clause, if specified */
 } JsonValueExpr;
 

Original file line number	Diff line number	Diff line change
`@@ -1243,7 +1243,8 @@ typedef struct JsonReturning`
`1243`	`1243`	`typedef struct JsonValueExpr`
`1244`	`1244`	`{`
`1245`	`1245`	`NodeTag type;`
`1246`		`- Expr expr; / raw expression */`
	`1246`	`+ Expr raw_expr; / raw expression */`
	`1247`	`+ Expr formatted_expr; / formatted expression or NULL */`
`1247`	`1248`	`JsonFormat format; / FORMAT clause, if specified */`
`1248`	`1249`	`} JsonValueExpr;`
`1249`	`1250`