Remove COERCE_INTERNAL_CAST in IS JSON

Nikita Glukhov · Nikita Glukhov · commit 62db6a7d098d · 2020-07-29T19:01:10.000+03:00
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
@@ -4353,15 +4353,24 @@ transformJsonArrayConstructor(ParseState *pstate, JsonArrayConstructor *ctor)
 static Node *
 transformJsonIsPredicate(ParseState *pstate, JsonIsPredicate *pred)
 {
-	Node	   *expr = transformExprRecurse(pstate, pred->expr);
+	Node	   *raw_expr = transformExprRecurse(pstate, pred->expr);
+	Node	   *expr = raw_expr;
 	Oid			exprtype = exprType(expr);
 
 	/* prepare input document */
 	if (exprtype == BYTEAOID)
 	{
+		JsonValueExpr *jve;
+
+		expr = makeCaseTestExpr(raw_expr);
 		expr = makeJsonByteaToTextConversion(expr, pred->format,
 											 exprLocation(expr));
 		exprtype = TEXTOID;
+
+		jve = makeJsonValueExpr((Expr *) raw_expr, pred->format);
+
+		jve->formatted_expr = (Expr *) expr;
+		expr = (Node *) jve;
 	}
 	else
 	{
@@ -4386,8 +4395,6 @@ transformJsonIsPredicate(ParseState *pstate, JsonIsPredicate *pred)
 					 errmsg("cannot use JSON FORMAT ENCODING clause for non-bytea input types")));
 	}
 
-	expr = (Node *) makeJsonValueExpr((Expr *) expr, pred->format);
-
 	/* make resulting expression */
 	if (exprtype != TEXTOID && exprtype != JSONOID && exprtype != JSONBOID)
 		ereport(ERROR,
