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

Fix information.columns column_type display width

Browse Source
This commit is contained in:
hezuojiao
2023-08-01 20:18:27 +00:00
committed by ob-robot
parent 7e4acc8d59
commit 1d658a366d
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/share/inner_table/ob_inner_table_schema.10001_10050.cpp
View File

@ -444,7 +444,7 @@ int ObInnerTableSchema::tenant_virtual_table_column_schema(ObTableSchema &table_
0, //part_key_pos 0, //part_key_pos
ObVarcharType, //column_type ObVarcharType, //column_type
CS_TYPE_INVALID, //column_collation_type CS_TYPE_INVALID, //column_collation_type
COLUMN_TYPE_LENGTH, //column_length OB_MAX_VARCHAR_LENGTH, //column_length
-1, //column_precision -1, //column_precision
-1, //column_scale -1, //column_scale
false, //is_nullable false, //is_nullable

4
src/share/inner_table/ob_inner_table_schema.12101_12150.cpp
View File

@ -9598,7 +9598,7 @@ int ObInnerTableSchema::all_virtual_information_columns_schema(ObTableSchema &ta
0, //part_key_pos 0, //part_key_pos
ObVarcharType, //column_type ObVarcharType, //column_type
CS_TYPE_INVALID, //column_collation_type CS_TYPE_INVALID, //column_collation_type
COLUMN_TYPE_LENGTH, //column_length OB_MAX_VARCHAR_LENGTH, //column_length
-1, //column_precision -1, //column_precision
-1, //column_scale -1, //column_scale
false, //is_nullable false, //is_nullable
@ -9720,7 +9720,7 @@ int ObInnerTableSchema::all_virtual_information_columns_schema(ObTableSchema &ta
0, //part_key_pos 0, //part_key_pos
ObVarcharType, //column_type ObVarcharType, //column_type
CS_TYPE_INVALID, //column_collation_type CS_TYPE_INVALID, //column_collation_type
COLUMN_TYPE_LENGTH, //column_length OB_MAX_VARCHAR_LENGTH, //column_length
-1, //column_precision -1, //column_precision
-1, //column_scale -1, //column_scale
false, //is_nullable false, //is_nullable

2
src/share/inner_table/ob_inner_table_schema.15051_15100.cpp
View File

@ -260,7 +260,7 @@ int ObInnerTableSchema::tenant_virtual_table_column_ora_schema(ObTableSchema &ta
0, //part_key_pos 0, //part_key_pos
ObVarcharType, //column_type ObVarcharType, //column_type
CS_TYPE_UTF8MB4_BIN, //column_collation_type CS_TYPE_UTF8MB4_BIN, //column_collation_type
COLUMN_TYPE_LENGTH, //column_length OB_MAX_VARCHAR_LENGTH, //column_length
2, //column_precision 2, //column_precision
-1, //column_scale -1, //column_scale
false, //is_nullable false, //is_nullable

6
src/share/inner_table/ob_inner_table_schema_def.py
View File

@ -5815,7 +5815,7 @@ def_table_schema(
in_tenant_space = True, in_tenant_space = True,
normal_columns = [ normal_columns = [
('type', 'varchar:COLUMN_TYPE_LENGTH'), ('type', 'varchar:OB_MAX_VARCHAR_LENGTH'),
('collation', 'varchar:MAX_COLLATION_LENGTH', 'true'), ('collation', 'varchar:MAX_COLLATION_LENGTH', 'true'),
('null', 'varchar:COLUMN_NULLABLE_LENGTH'), ('null', 'varchar:COLUMN_NULLABLE_LENGTH'),
('key', 'varchar:COLUMN_KEY_LENGTH'), ('key', 'varchar:COLUMN_KEY_LENGTH'),
@ -9420,7 +9420,7 @@ def_table_schema(
('ORDINAL_POSITION', 'uint', 'false', '0'), ('ORDINAL_POSITION', 'uint', 'false', '0'),
('COLUMN_DEFAULT', 'varchar:OB_MAX_DEFAULT_VALUE_LENGTH', 'true'), ('COLUMN_DEFAULT', 'varchar:OB_MAX_DEFAULT_VALUE_LENGTH', 'true'),
('IS_NULLABLE', 'varchar:COLUMN_NULLABLE_LENGTH', 'false', ''), ('IS_NULLABLE', 'varchar:COLUMN_NULLABLE_LENGTH', 'false', ''),
('DATA_TYPE', 'varchar:COLUMN_TYPE_LENGTH', 'false', ''), ('DATA_TYPE', 'varchar:OB_MAX_VARCHAR_LENGTH', 'false', ''),
('CHARACTER_MAXIMUM_LENGTH', 'uint', 'true'), ('CHARACTER_MAXIMUM_LENGTH', 'uint', 'true'),
('CHARACTER_OCTET_LENGTH', 'uint', 'true'), ('CHARACTER_OCTET_LENGTH', 'uint', 'true'),
('NUMERIC_PRECISION', 'uint', 'true'), ('NUMERIC_PRECISION', 'uint', 'true'),
@ -9428,7 +9428,7 @@ def_table_schema(
('DATETIME_PRECISION', 'uint', 'true'), ('DATETIME_PRECISION', 'uint', 'true'),
('CHARACTER_SET_NAME', 'varchar:MAX_CHARSET_LENGTH', 'true'), ('CHARACTER_SET_NAME', 'varchar:MAX_CHARSET_LENGTH', 'true'),
('COLLATION_NAME', 'varchar:MAX_COLLATION_LENGTH', 'true'), ('COLLATION_NAME', 'varchar:MAX_COLLATION_LENGTH', 'true'),
('COLUMN_TYPE', 'varchar:COLUMN_TYPE_LENGTH'), ('COLUMN_TYPE', 'varchar:OB_MAX_VARCHAR_LENGTH'),
('COLUMN_KEY', 'varchar:MAX_COLUMN_KEY_LENGTH', 'false', ''), ('COLUMN_KEY', 'varchar:MAX_COLUMN_KEY_LENGTH', 'false', ''),
('EXTRA', 'varchar:COLUMN_EXTRA_LENGTH', 'false', ''), ('EXTRA', 'varchar:COLUMN_EXTRA_LENGTH', 'false', ''),
('PRIVILEGES', 'varchar:MAX_COLUMN_PRIVILEGE_LENGTH', 'false', ''), ('PRIVILEGES', 'varchar:MAX_COLUMN_PRIVILEGE_LENGTH', 'false', ''),

4
tools/deploy/mysql_test/test_suite/information_schema/r/mysql/information_schema_desc.result
View File

@ -26,7 +26,7 @@ COLUMN_NAME varchar(128) NO
ORDINAL_POSITION bigint(20) unsigned NO ORDINAL_POSITION bigint(20) unsigned NO
COLUMN_DEFAULT varchar(262144) YES NULL COLUMN_DEFAULT varchar(262144) YES NULL
IS_NULLABLE varchar(4) NO IS_NULLABLE varchar(4) NO
DATA_TYPE varchar(64) NO DATA_TYPE varchar(1048576) NO
CHARACTER_MAXIMUM_LENGTH bigint(20) unsigned YES NULL CHARACTER_MAXIMUM_LENGTH bigint(20) unsigned YES NULL
CHARACTER_OCTET_LENGTH bigint(20) unsigned YES NULL CHARACTER_OCTET_LENGTH bigint(20) unsigned YES NULL
NUMERIC_PRECISION bigint(20) unsigned YES NULL NUMERIC_PRECISION bigint(20) unsigned YES NULL
@ -34,7 +34,7 @@ NUMERIC_SCALE bigint(20) unsigned YES NULL
DATETIME_PRECISION bigint(20) unsigned YES NULL DATETIME_PRECISION bigint(20) unsigned YES NULL
CHARACTER_SET_NAME varchar(128) YES NULL CHARACTER_SET_NAME varchar(128) YES NULL
COLLATION_NAME varchar(128) YES NULL COLLATION_NAME varchar(128) YES NULL
COLUMN_TYPE varchar(64) NO NULL COLUMN_TYPE varchar(1048576) NO NULL
COLUMN_KEY varchar(3) NO COLUMN_KEY varchar(3) NO
EXTRA varchar(4096) NO EXTRA varchar(4096) NO
PRIVILEGES varchar(200) NO PRIVILEGES varchar(200) NO