From 3e3a622c0a5d671aedf68670cf24771ece6f59e5 Mon Sep 17 00:00:00 2001 From: wjhh2008 Date: Wed, 11 Oct 2023 10:44:05 +0000 Subject: [PATCH] fix mysqltest for invalid identifier --- src/sql/resolver/dml/ob_select_resolver.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/sql/resolver/dml/ob_select_resolver.cpp b/src/sql/resolver/dml/ob_select_resolver.cpp index 4b4f3accf8..dc4d977b72 100644 --- a/src/sql/resolver/dml/ob_select_resolver.cpp +++ b/src/sql/resolver/dml/ob_select_resolver.cpp @@ -1850,19 +1850,15 @@ int ObSelectResolver::resolve_field_list(const ParseNode &node) continue; } if (OB_SUCC(ret)) { - if (OB_FAIL(ObCharset::charset_convert(*allocator_, - select_item.expr_name_, - session_info_->get_local_collation_connection(), - CS_TYPE_UTF8MB4_BIN, + if (OB_FAIL(ObSQLUtils::convert_sql_text_to_schema_for_storing(*allocator_, + session_info_->get_dtc_params(), select_item.expr_name_, ObCharset::REPLACE_UNKNOWN_CHARACTER))) { LOG_WARN("fail to charset convert", K(ret)); - } else if (OB_FAIL(ObCharset::charset_convert(*allocator_, - select_item.alias_name_, - session_info_->get_local_collation_connection(), - CS_TYPE_UTF8MB4_BIN, - select_item.alias_name_, - ObCharset::REPLACE_UNKNOWN_CHARACTER))) { + } else if (OB_FAIL(ObSQLUtils::convert_sql_text_to_schema_for_storing(*allocator_, + session_info_->get_dtc_params(), + select_item.alias_name_, + ObCharset::REPLACE_UNKNOWN_CHARACTER))) { LOG_WARN("fail to charset convert", K(ret)); } }