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

Fix some prepared statement bug

Browse Source
This commit is contained in:
obdev
2023-05-17 14:22:00 +00:00
committed by ob-robot
parent 088e14bdc0
commit e556c2117c
4 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/sql/engine/expr/ob_expr_cast.cpp
View File

@ -329,9 +329,14 @@ int ObExprCast::calc_result_type2(ObExprResType &type,
LOG_WARN("adjust udt cast sub type failed", K(ret));
} else if (OB_UNLIKELY(!cast_supported(type1.get_type(), type1.get_collation_type(),
dst_type.get_type(), dst_type.get_collation_type()))) {
ret = OB_ERR_INVALID_TYPE_FOR_OP;
LOG_WARN("transition does not support", "src", ob_obj_type_str(type1.get_type()),
"dst", ob_obj_type_str(dst_type.get_type()));
if (session->is_ps_prepare_stage()) {
type.set_null();
LOG_TRACE("ps prepare phase ignores type deduce error");
} else {
ret = OB_ERR_INVALID_TYPE_FOR_OP;
LOG_WARN("transition does not support", "src", ob_obj_type_str(type1.get_type()),
"dst", ob_obj_type_str(dst_type.get_type()));
}
} else if (FALSE_IT(is_explicit_cast = CM_IS_EXPLICIT_CAST(cast_raw_expr->get_extra()))) {
// check cast supported in cast_map but not support here.
} else if (OB_FAIL(ObSQLUtils::get_cs_level_from_cast_mode(cast_raw_expr->get_extra(),
@ -341,8 +346,13 @@ int ObExprCast::calc_result_type2(ObExprResType &type,
} else if (!check_cast_allowed(type1.get_type(), type1.get_collation_type(),
dst_type.get_type(), dst_type.get_collation_type(),
is_explicit_cast)) {
ret = OB_ERR_INVALID_TYPE_FOR_OP;
LOG_WARN("explicit cast to lob type not allowed", K(ret), K(dst_type));
if (session->is_ps_prepare_stage()) {
type.set_null();
LOG_TRACE("ps prepare phase ignores type deduce error");
} else {
ret = OB_ERR_INVALID_TYPE_FOR_OP;
LOG_WARN("explicit cast to lob type not allowed", K(ret), K(dst_type));
}
} else {
// always cast to user requested type
if (is_explicit_cast && !lib::is_oracle_mode() &&

2
src/sql/engine/expr/ob_expr_left.cpp
View File

@ -78,6 +78,8 @@ int ObExprLeft::calc_result_type2(ObExprResType &type,
} else if (exec_ctx->is_ps_prepare_stage()) {
// the ps prepare stage does not do type deduction, and directly gives a default type.
type.set_char();
type.set_default_collation_type();
type.set_collation_level(CS_LEVEL_IMPLICIT);
type.set_length(0);
} else {
type2.set_calc_type(ObIntType);