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

fix error codes incompatible in in-operator and nullif / join / returning with xmltype

Browse Source
This commit is contained in:
obdev
2023-05-16 12:22:00 +00:00
committed by ob-robot
parent 55547cf8f5
commit d79ccfaa6e
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/engine/expr/ob_expr_operator.cpp
View File

@ -1985,9 +1985,8 @@ int ObExprOperator::calc_cmp_type2(ObExprResType &type,
ret = OB_ERR_INVALID_CMP_OP;
LOG_WARN("incorrect cmp type with json arguments", K(type1), K(type2), K(type_), K(ret));
} else if (is_oracle_mode()
&& (ob_is_user_defined_type(type1.get_type())
|| ob_is_user_defined_type(type2.get_type()))
&& ((type_ >= T_OP_EQ && type_ <= T_OP_NE) || type_ == T_FUN_SYS_NULLIF)) {
&& (ob_is_user_defined_type(type1.get_type()) || ob_is_user_defined_type(type2.get_type()))) {
// udt tyes not implemented in ORACLE_RELATIONAL_CMP_TYPE curretly
if ((ob_is_user_defined_type(type1.get_type()) && ob_is_user_defined_type(type2.get_type()))
|| (type1.is_null() || type2.is_null())) {
ret = OB_ERR_NO_ORDER_MAP_SQL; // oracle error code compability

4
src/sql/engine/expr/ob_expr_oracle_nullif.cpp
View File

@ -134,7 +134,9 @@ bool ObExprOracleNullif::is_same_type(const ObExprResType &type1,
if (oracleType1 == oracleType2 ||
is_numberic_type(oracleType1, oracleType2) ||
is_string_type(oracleType1, oracleType2) ||
is_time_type(oracleType1, oracleType2)) {
is_time_type(oracleType1, oracleType2) ||
((oracleType1 == ObOExtendType || oracleType1 == ObOUDTSqlType)
&& (oracleType2 == ObOExtendType || oracleType2 == ObOUDTSqlType))) {
ret = true;
}