提交 9d200b49 编写于 作者: O obdev 提交者: wangzelin.wzl

[CP] Fix json cast (issue/41928694 & issue/41985147)

上级 5ade6a52
...@@ -40,7 +40,7 @@ int ObExprIfNull::calc_result_type2( ...@@ -40,7 +40,7 @@ int ObExprIfNull::calc_result_type2(
LOG_WARN("session is NULL", K(ret)); LOG_WARN("session is NULL", K(ret));
} else if (OB_FAIL(ObExprPromotionUtil::get_nvl_type(type, type1, type2))) { } else if (OB_FAIL(ObExprPromotionUtil::get_nvl_type(type, type1, type2))) {
LOG_WARN("failed to get nvl type", K(ret)); LOG_WARN("failed to get nvl type", K(ret));
} else if (ob_is_string_type(type.get_type())) { } else if (ob_is_string_type(type.get_type()) || ob_is_json_tc(type.get_type())) {
ObCollationLevel res_cs_level = CS_LEVEL_INVALID; ObCollationLevel res_cs_level = CS_LEVEL_INVALID;
ObCollationType res_cs_type = CS_TYPE_INVALID; ObCollationType res_cs_type = CS_TYPE_INVALID;
if (OB_FAIL(ObCharset::aggregate_collation(type1.get_collation_level(), if (OB_FAIL(ObCharset::aggregate_collation(type1.get_collation_level(),
......
...@@ -1779,7 +1779,7 @@ static ObObjType RELATIONAL_CMP_TYPE[ObMaxType][ObMaxType] = ...@@ -1779,7 +1779,7 @@ static ObObjType RELATIONAL_CMP_TYPE[ObMaxType][ObMaxType] =
ObVarcharType, /* ObNCharType */ ObVarcharType, /* ObNCharType */
ObNullType, /* ObURowIDType */ ObNullType, /* ObURowIDType */
ObNullType, /* ObLobType */ ObNullType, /* ObLobType */
ObMaxType, /* ObJsonType */ ObNumberType, /* ObJsonType */
}, },
/*EnumInnerType*/ /*EnumInnerType*/
{ {
...@@ -2480,7 +2480,7 @@ static ObObjType RELATIONAL_CMP_TYPE[ObMaxType][ObMaxType] = ...@@ -2480,7 +2480,7 @@ static ObObjType RELATIONAL_CMP_TYPE[ObMaxType][ObMaxType] =
ObJsonType, /*LongTextType*/ ObJsonType, /*LongTextType*/
ObJsonType, /*BitType*/ ObJsonType, /*BitType*/
ObMaxType, /* EnumType */ ObMaxType, /* EnumType */
ObMaxType, /* SetType */ ObNumberType, /* SetType */
ObMaxType, /* EnumInnerType */ ObMaxType, /* EnumInnerType */
ObMaxType, /* SetInnerType */ ObMaxType, /* SetInnerType */
ObTimestampTZType, /* ObTimestampTZType */ ObTimestampTZType, /* ObTimestampTZType */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册