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

[xml bugfix] adapt insert all for xml type and extract bugfix

Browse Source
This commit is contained in:
obdev
2023-07-11 20:18:27 +00:00
committed by ob-robot
parent 1e068b57be
commit 976456c113
4 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/sql/resolver/dml/ob_multi_table_insert_resolver.cpp
View File

@ -599,6 +599,7 @@ int ObMultiTableInsertResolver::mock_values_column_ref(const ObColumnRefRawExpr
value_desc->set_dependant_expr(const_cast<ObRawExpr *>(column_ref->get_dependant_expr()));
value_desc->set_ref_id(table_info.table_id_, column_ref->get_column_id());
value_desc->set_column_attr(ObString::make_string(OB_VALUES), column_ref->get_column_name());
value_desc->set_udt_set_id(column_ref->get_udt_set_id());
if (ob_is_enumset_tc(column_ref->get_result_type().get_type ())
&& OB_FAIL(value_desc->set_enum_set_values(column_ref->get_enum_set_values()))) {
LOG_WARN("failed to set_enum_set_values", K(*column_ref), K(ret));

16
src/sql/resolver/expr/ob_raw_expr_deduce_type.cpp
View File

@ -1966,6 +1966,8 @@ int ObRawExprDeduceType::check_group_aggr_param(ObAggFunRawExpr &expr)
&& T_FUN_GROUP_CONCAT != expr.get_expr_type()
&& T_FUN_GROUP_PERCENT_RANK != expr.get_expr_type()
&& T_FUN_GROUP_RANK != expr.get_expr_type()))
&& !(ob_is_user_defined_sql_type(param_expr->get_data_type())
&& (T_FUN_APPROX_COUNT_DISTINCT == expr.get_expr_type() || T_FUN_APPROX_COUNT_DISTINCT_SYNOPSIS == expr.get_expr_type()))
&& !(T_FUN_COUNT == expr.get_expr_type() && ob_is_json(param_expr->get_data_type()))
&& !(T_FUN_COUNT == expr.get_expr_type() && (ob_is_user_defined_sql_type(param_expr->get_data_type()) ||
ob_is_user_defined_pl_type(param_expr->get_data_type())))
@ -3024,10 +3026,16 @@ int ObRawExprDeduceType::set_xmlagg_result_type(ObAggFunRawExpr &expr,
ret = OB_ERR_NO_ORDER_MAP_SQL;
LOG_WARN("cannot ORDER objects without MAP or ORDER method", K(ret));
}
} else if (order_expr->get_result_type().get_type() == ObUserDefinedSQLType
|| order_expr->get_result_type().get_type() == ObExtendType) {
ret = OB_ERR_NO_ORDER_MAP_SQL;
LOG_WARN("cannot ORDER objects without MAP or ORDER method", K(ret));
} else {
ObObjType result_type = order_expr->get_result_type().get_type();
if (result_type == ObUserDefinedSQLType || result_type == ObExtendType) {
ret = OB_ERR_NO_ORDER_MAP_SQL;
LOG_WARN("cannot ORDER objects without MAP or ORDER method", K(ret));
} else if (ob_is_text_tc(result_type) ||
ob_is_lob_tc(result_type)) {
ret = OB_ERR_INVALID_TYPE_FOR_OP;
LOG_WARN("Column of LOB type cannot be used for sorting", K(ret));
}
}
}