Fix JSON_VALUE coercion via IO

Nikita Glukhov · Nikita Glukhov · commit aff8ccfcf3d9 · 2020-07-29T19:01:13.000+03:00
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
@@ -4725,26 +4725,44 @@ ExecEvalJsonExpr(ExprState *state, ExprEvalStep *op, ExprContext *econtext,
 													 op->d.jsonexpr.args);
 				struct JsonCoercionState *jcstate;
 
-				if (!jbv)
+				if (!jbv)	/* NULL or empty */
 					break;
 
+				Assert(!empty);
+
 				*resnull = false;
 
+				/* coerce item datum to the output type */
+				if (jexpr->returning->typid == JSONOID ||
+					jexpr->returning->typid == JSONBOID)
+				{
+					/* Use result coercion from json[b] to the output type */
+					res = JsonbPGetDatum(JsonbValueToJsonb(jbv));
+					break;
+				}
+
+				/* Use coercion from SQL/JSON item type to the output type */
 				res = ExecPrepareJsonItemCoercion(jbv,
 												  op->d.jsonexpr.jsexpr->returning,
 												  &op->d.jsonexpr.coercions,
 												  &jcstate);
 
-				/* coerce item datum to the output type */
-				if ((jcstate->coercion &&
+				if (jcstate->coercion &&
 					(jcstate->coercion->via_io ||
-					 jcstate->coercion->via_populate)) || /* ignored for scalars jsons */
-					jexpr->returning->typid == JSONOID ||
-					jexpr->returning->typid == JSONBOID)
+					 jcstate->coercion->via_populate))
 				{
-					/* use coercion via I/O from json[b] to the output type */
-					res = JsonbPGetDatum(JsonbValueToJsonb(jbv));
-					res = ExecEvalJsonExprCoercion(op, econtext, res, resnull);
+					/*
+					 * Coercion via I/O means here that the cast to the target
+					 * type simply does not exist.
+					 */
+					ereport(ERROR,
+							/*
+							 * XXX Standard says about a separate error code
+							 * ERRCODE_SQL_JSON_ITEM_CANNOT_BE_CAST_TO_TARGET_TYPE
+							 * but does not define its number.
+							 */
+							(errcode(ERRCODE_SQL_JSON_SCALAR_REQUIRED),
+							 errmsg("SQL/JSON item cannot be cast to target type")));
 				}
 				else if (jcstate->estate)
 				{
@@ -4754,17 +4772,16 @@ ExecEvalJsonExpr(ExprState *state, ExprEvalStep *op, ExprContext *econtext,
 					res = ExecEvalExpr(jcstate->estate, econtext, resnull);
 				}
 				/* else no coercion */
+
+				return res;
 			}
-			break;
 
 		case IS_JSON_EXISTS:
-			res = BoolGetDatum(JsonbPathExists(item, path, op->d.jsonexpr.args));
 			*resnull = false;
-			break;
+			return BoolGetDatum(JsonbPathExists(item, path, op->d.jsonexpr.args));
 
 		default:
-			elog(ERROR, "unrecognized SQL/JSON expression op %d",
-				 jexpr->op);
+			elog(ERROR, "unrecognized SQL/JSON expression op %d", jexpr->op);
 			return (Datum) 0;
 	}
 
@@ -4780,15 +4797,13 @@ ExecEvalJsonExpr(ExprState *state, ExprEvalStep *op, ExprContext *econtext,
 		/* execute ON EMPTY behavior */
 		res = ExecEvalJsonBehavior(econtext, jexpr->on_empty,
 								   op->d.jsonexpr.default_on_empty, resnull);
-	}
 
-	if (jexpr->op != IS_JSON_EXISTS &&
-		(!empty ? jexpr->op != IS_JSON_VALUE :
-		 /* result is already coerced in DEFAULT behavior case */
-		 jexpr->on_empty->btype != JSON_BEHAVIOR_DEFAULT))
-		res = ExecEvalJsonExprCoercion(op, econtext, res, resnull);
+		/* result is already coerced in DEFAULT behavior case */
+		if (jexpr->on_empty->btype == JSON_BEHAVIOR_DEFAULT)
+			return res;
+	}
 
-	return res;
+	return ExecEvalJsonExprCoercion(op, econtext, res, resnull);
 }
 
 bool
diff --git a/src/test/regress/expected/jsonb_sqljson.out b/src/test/regress/expected/jsonb_sqljson.out
@@ -190,12 +190,8 @@ SELECT JSON_VALUE(jsonb '123', '$' RETURNING text);
 (1 row)
 
 /* jsonb bytea ??? */
-SELECT JSON_VALUE(jsonb '123', '$' RETURNING bytea);
- json_value 
-------------
- \x313233
-(1 row)
-
+SELECT JSON_VALUE(jsonb '123', '$' RETURNING bytea ERROR ON ERROR);
+ERROR:  SQL/JSON item cannot be cast to target type
 SELECT JSON_VALUE(jsonb '1.23', '$');
  json_value 
 ------------
diff --git a/src/test/regress/sql/jsonb_sqljson.sql b/src/test/regress/sql/jsonb_sqljson.sql
@@ -46,7 +46,7 @@ SELECT JSON_VALUE(jsonb '123', '$');
 SELECT JSON_VALUE(jsonb '123', '$' RETURNING int) + 234;
 SELECT JSON_VALUE(jsonb '123', '$' RETURNING text);
 /* jsonb bytea ??? */
-SELECT JSON_VALUE(jsonb '123', '$' RETURNING bytea);
+SELECT JSON_VALUE(jsonb '123', '$' RETURNING bytea ERROR ON ERROR);
 
 SELECT JSON_VALUE(jsonb '1.23', '$');
 SELECT JSON_VALUE(jsonb '1.23', '$' RETURNING int);
