bugfix: 1. xml insert into view with trigger; 2. refresh mysqltest result;
This commit is contained in:
parent
8f6b152ac8
commit
827b288161
@ -80,7 +80,7 @@ static int cast_not_expected(const ObObjType expect_type,
|
||||
UNUSED(params);
|
||||
LOG_WARN_RET(OB_ERR_UNEXPECTED, "not expected obj type convert",
|
||||
K(expect_type), K(in), K(out), K(cast_mode));
|
||||
return OB_ERR_UNEXPECTED;
|
||||
return lib::is_oracle_mode() ? OB_ERR_INVALID_DATATYPE : OB_ERR_UNEXPECTED;
|
||||
}
|
||||
|
||||
static int cast_inconsistent_types(const ObObjType expect_type,
|
||||
|
@ -4811,6 +4811,12 @@ int ObStaticEngineCG::recursive_get_column_expr(const ObColumnRefRawExpr *&colum
|
||||
ret = OB_ERR_UNEXPECTED;
|
||||
LOG_WARN("get unexpected select expr", K(ret),
|
||||
K(offset), K(stmt->get_select_item_size()), K(select_expr));
|
||||
} else if (OB_UNLIKELY(!select_expr->is_column_ref_expr()) && column->is_xml_column()
|
||||
&& select_expr->get_expr_type() == T_FUN_SYS_MAKEXML
|
||||
&& OB_NOT_NULL(select_expr->get_param_expr(1))) {
|
||||
select_expr = select_expr->get_param_expr(1);
|
||||
}
|
||||
if (OB_FAIL(ret)) {
|
||||
} else if (OB_UNLIKELY(!select_expr->is_column_ref_expr())) {
|
||||
ret = OB_ERR_UNEXPECTED;
|
||||
LOG_WARN("get unexpected expr", K(ret), K(*select_expr));
|
||||
|
Loading…
x
Reference in New Issue
Block a user