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

Bugfixs patched from 3.1.x to 3.1_opensource_release

Browse Source
This commit is contained in:
sl0
2021-07-29 14:03:21 +08:00
committed by wangzelin.wzl
parent 9bbbb31585
commit 4640a92c31
26 changed files with 217 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/resolver/dml/ob_column_namespace_checker.cpp
View File

@ -295,6 +295,7 @@ int ObColumnNamespaceChecker::find_column_in_single_table(
// if databasename or table name is not specified,
// we must check the uniqueness of column in the table with the same name
bool is_match = true;
LOG_TRACE("column info", K(q_name), K(table_item));
if (!q_name.database_name_.empty()) {
if (OB_FAIL(ObResolverUtils::name_case_cmp(
params_.session_info_, q_name.database_name_, table_item.database_name_, OB_TABLE_NAME_CLASS, is_match))) {
@ -314,11 +315,6 @@ int ObColumnNamespaceChecker::find_column_in_single_table(
params_.session_info_, q_name.tbl_name_, table_item.get_object_name(), OB_TABLE_NAME_CLASS, is_match))) {
LOG_WARN("database name case compare failed", K(ret));
}
if (OB_SUCC(ret) && !is_match && !table_item.synonym_name_.empty() &&
OB_FAIL(ObResolverUtils::name_case_cmp(
params_.session_info_, q_name.tbl_name_, table_item.synonym_name_, OB_TABLE_NAME_CLASS, is_match))) {
LOG_WARN("database name case compare failed", K(ret));
}
}
if (OB_SUCC(ret) && is_match) {
if (OB_FAIL(check_column_exists(table_item, q_name.col_name_, is_match))) {