hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[CP] Fix Json cast

Browse Source
This commit is contained in:
obdev
2022-08-22 15:49:19 +08:00
committed by wangzelin.wzl
parent 731f8741d3
commit ffcbed5623
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sql/engine/expr/ob_expr_merge_result_type.map
View File

@ -1809,7 +1809,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = {
ObNCharType, /*ObEnumInnerType=>ObNCharType */ ObNCharType, /*ObEnumInnerType=>ObNCharType */
ObMaxType, /*ObEnumInnerType=>URowID*/ ObMaxType, /*ObEnumInnerType=>URowID*/
ObMaxType, /*ObEnumInnerType=>ObLobType*/ ObMaxType, /*ObEnumInnerType=>ObLobType*/
ObMaxType, /*ObEnumInnerType=>ObJsonType*/ ObVarcharType, /*ObEnumInnerType=>ObJsonType*/
}, },
/*ObSetInnerType*/ /*ObSetInnerType*/
{ {
@ -1860,7 +1860,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = {
ObNCharType, /*ObSetInnerType=>ObNCharType */ ObNCharType, /*ObSetInnerType=>ObNCharType */
ObMaxType, /*ObSetInnerType=>URowID*/ ObMaxType, /*ObSetInnerType=>URowID*/
ObMaxType, /*ObSetInnerType=>ObLobType*/ ObMaxType, /*ObSetInnerType=>ObLobType*/
ObMaxType, /*ObSetInnerType=>ObJsonType*/ ObVarcharType, /*ObSetInnerType=>ObJsonType*/
}, },
/*ObTimestampTZType*/ /*ObTimestampTZType*/
{ {
@ -2460,8 +2460,8 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = {
ObJsonType, /* ObJsonType=>ObBitType */ ObJsonType, /* ObJsonType=>ObBitType */
ObVarcharType, /* ObJsonType=>ObEnumType */ ObVarcharType, /* ObJsonType=>ObEnumType */
ObVarcharType, /* ObJsonType=>ObSetType */ ObVarcharType, /* ObJsonType=>ObSetType */
ObMaxType, /* ObJsonType=>ObEnumInnerType */ ObVarcharType, /* ObJsonType=>ObEnumInnerType */
ObMaxType, /* ObJsonType=>ObSetInnerType */ ObVarcharType, /* ObJsonType=>ObSetInnerType */
ObMaxType, /* ObJsonType=>ObTimestampTZType */ ObMaxType, /* ObJsonType=>ObTimestampTZType */
ObMaxType, /* ObJsonType=>ObTimestampLTZType */ ObMaxType, /* ObJsonType=>ObTimestampLTZType */
ObMaxType, /* ObJsonType=>ObTimestampNanoType */ ObMaxType, /* ObJsonType=>ObTimestampNanoType */

8
src/sql/engine/expr/ob_expr_relational_cmp_type.map
View File

@ -1830,7 +1830,7 @@ static ObObjType RELATIONAL_CMP_TYPE[ObMaxType][ObMaxType] =
ObVarcharType, /* ObNCharType */ ObVarcharType, /* ObNCharType */
ObNullType, /* ObURowIDType */ ObNullType, /* ObURowIDType */
ObNullType, /* ObLobType */ ObNullType, /* ObLobType */
ObMaxType, /* ObJsonType */ ObNumberType, /* ObJsonType */
}, },
/*SetInnerType*/ /*SetInnerType*/
{ {
@ -1881,7 +1881,7 @@ static ObObjType RELATIONAL_CMP_TYPE[ObMaxType][ObMaxType] =
ObVarcharType, /* ObNCharType */ ObVarcharType, /* ObNCharType */
ObNullType, /* ObURowIDType */ ObNullType, /* ObURowIDType */
ObNullType, /* ObLobType */ ObNullType, /* ObLobType */
ObMaxType, /* ObJsonType */ ObNumberType, /* ObJsonType */
}, },
/*ObTimestampTZType*/ /*ObTimestampTZType*/
{ {
@ -2481,8 +2481,8 @@ static ObObjType RELATIONAL_CMP_TYPE[ObMaxType][ObMaxType] =
ObJsonType, /*BitType*/ ObJsonType, /*BitType*/
ObNumberType, /* EnumType */ ObNumberType, /* EnumType */
ObNumberType, /* SetType */ ObNumberType, /* SetType */
ObMaxType, /* EnumInnerType */ ObNumberType, /* EnumInnerType */
ObMaxType, /* SetInnerType */ ObNumberType, /* SetInnerType */
ObTimestampTZType, /* ObTimestampTZType */ ObTimestampTZType, /* ObTimestampTZType */
ObTimestampLTZType, /* ObTimestampLTZType */ ObTimestampLTZType, /* ObTimestampLTZType */
ObTimestampNanoType, /* ObTimestampNanoType */ ObTimestampNanoType, /* ObTimestampNanoType */