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

fix alter table add column check 4016

Browse Source
This commit is contained in:
SevenJ-swj
2023-08-09 03:18:31 +00:00
committed by ob-robot
parent 42e2bf468b
commit 2654746463
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sql/resolver/ddl/ob_ddl_resolver.cpp
View File

@ -2664,6 +2664,19 @@ int ObDDLResolver::resolve_column_definition(ObColumnSchemaV2 &column,
} }
} }
if (OB_SUCC(ret) && (column.is_string_type() || column.is_json() || column.is_geometry())
&& stmt::T_ALTER_TABLE == stmt_->get_stmt_type()) {
if (OB_DDL_ADD_COLUMN == static_cast<AlterColumnSchema&>(column).alter_type_) {
ObTableSchema &table_schema = static_cast<ObAlterTableStmt *>(stmt_)->get_alter_table_arg().alter_table_schema_;
if (OB_FAIL(check_and_fill_column_charset_info(column,
table_schema.get_charset_type(),
table_schema.get_collation_type()))) {
SQL_RESV_LOG(WARN, "fail to check and fill column charset info", K(ret));
}
}
}
if (OB_SUCC(ret) && (column.is_string_type() || column.is_json() || column.is_geometry()) if (OB_SUCC(ret) && (column.is_string_type() || column.is_json() || column.is_geometry())
&& stmt::T_CREATE_TABLE == stmt_->get_stmt_type()) { && stmt::T_CREATE_TABLE == stmt_->get_stmt_type()) {
if (OB_FAIL(check_and_fill_column_charset_info(column, charset_type_, collation_type_))) { if (OB_FAIL(check_and_fill_column_charset_info(column, charset_type_, collation_type_))) {