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

[to #40760427]fix mysqlTest

Browse Source
This commit is contained in:
seuwebber
2023-05-30 04:41:09 +00:00
committed by ob-robot
parent 744a7ed6c4
commit 759f4bbfa2
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/engine/dml/ob_trigger_handler.cpp
View File

@ -412,7 +412,10 @@ int TriggerHandle::calc_trigger_routine(
trigger_id, routine_id, params); trigger_id, routine_id, params);
CK (OB_NOT_NULL(exec_ctx.get_my_session())); CK (OB_NOT_NULL(exec_ctx.get_my_session()));
OZ (exec_ctx.get_my_session()->reset_all_package_state_by_dbms_session(true)); OZ (exec_ctx.get_my_session()->reset_all_package_state_by_dbms_session(true));
OX (exec_ctx.get_my_session()->set_for_trigger_package(old_flag)); if (exec_ctx.get_my_session()->is_for_trigger_package()) {
// whether `ret == OB_SUCCESS`, need to restore flag
exec_ctx.get_my_session()->set_for_trigger_package(old_flag);
}
return ret; return ret;
} }

3
src/sql/resolver/dml/ob_del_upd_resolver.cpp
View File

@ -3280,8 +3280,7 @@ int ObDelUpdResolver::resolve_insert_values(const ParseNode *node,
} else if (OB_FAIL(check_basic_column_generated(column_expr, del_upd_stmt, } else if (OB_FAIL(check_basic_column_generated(column_expr, del_upd_stmt,
is_generated_column))) { is_generated_column))) {
LOG_WARN("check column generated failed", K(ret)); LOG_WARN("check column generated failed", K(ret));
} else if (is_generated_column && !session_info_->is_for_trigger_package()) { } else if (is_generated_column) {
//兼容oracle，如果是创建trigger过程中发现该错误，不报错，在执行阶段会报错
ret = OB_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN; ret = OB_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN;
if (!is_oracle_mode()) { if (!is_oracle_mode()) {
ColumnItem *orig_col_item = NULL; ColumnItem *orig_col_item = NULL;