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

fix mysqltest for implicit cast of charset convert

Browse Source
This commit is contained in:
SevenJ-swj
2023-08-30 05:10:36 +00:00
committed by ob-robot
parent 6a5684ed71
commit e024bcd778
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/sql/engine/expr/ob_expr_column_conv.cpp
View File

@ -285,15 +285,16 @@ int ObExprColumnConv::calc_result_typeN(ObExprResType &type,
LOG_WARN("inconsistent datatypes", "expected", type_tc, "got", value_tc); LOG_WARN("inconsistent datatypes", "expected", type_tc, "got", value_tc);
} else { } else {
bool is_ddl = const_cast<sql::ObSQLSessionInfo *>(type_ctx.get_session())->get_ddl_info().is_ddl(); bool is_ddl = const_cast<sql::ObSQLSessionInfo *>(type_ctx.get_session())->get_ddl_info().is_ddl();
type_ctx.set_cast_mode(type_ctx.get_cast_mode() |
type_ctx.get_raw_expr()->get_extra() |
CM_COLUMN_CONVERT);
if (!is_ddl) { if (!is_ddl) {
type_ctx.set_cast_mode(type_ctx.get_cast_mode() | bool is_strict = is_strict_mode(type_ctx.get_session()->get_sql_mode());
type_ctx.get_raw_expr()->get_extra() | if (lib::is_mysql_mode() && is_strict) {
CM_COLUMN_CONVERT | //do nothing
CM_CHARSET_CONVERT_IGNORE_ERR); } else {
} else { type_ctx.set_cast_mode(type_ctx.get_cast_mode() | CM_CHARSET_CONVERT_IGNORE_ERR);
type_ctx.set_cast_mode(type_ctx.get_cast_mode() | }
type_ctx.get_raw_expr()->get_extra() |
CM_COLUMN_CONVERT );
} }
types[4].set_calc_meta(type); types[4].set_calc_meta(type);
} }

9
src/sql/resolver/expr/ob_raw_expr_util.cpp
View File

@ -3776,10 +3776,15 @@ int ObRawExprUtils::try_add_cast_expr_above(ObRawExprFactory *expr_factory,
K(session->get_current_query_string())); K(session->get_current_query_string()));
#endif #endif
} else { } else {
//setup implicit cast charset convert ignore error
ObCastMode cm_zf = cm;
if ((cm_zf & CM_COLUMN_CONVERT) != 0) {
//if CM_CHARSET_CONVERT_IGNORE_ERR should be set is judged in column_conv expr.
} else {
cm_zf |= CM_CHARSET_CONVERT_IGNORE_ERR;
}
// setup zerofill cm // setup zerofill cm
// eg: select concat(cast(c_zf as char(10)), cast(col_no_zf as char(10))) from t1; // eg: select concat(cast(c_zf as char(10)), cast(col_no_zf as char(10))) from t1;
ObCastMode cm_zf = cm;
cm_zf |= CM_CHARSET_CONVERT_IGNORE_ERR;
if (expr.get_result_type().has_result_flag(ZEROFILL_FLAG)) { if (expr.get_result_type().has_result_flag(ZEROFILL_FLAG)) {
cm_zf |= CM_ZERO_FILL; cm_zf |= CM_ZERO_FILL;
} }