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

support displaying the correct DEFAULT_CHARACTER_SET_NAME and DEFAULT_COLLATION_NAME

Browse Source
This commit is contained in:
dimstars
2023-04-13 08:44:07 +00:00
committed by ob-robot
parent 3926fdba2f
commit e175a19daa
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/share/inner_table/ob_inner_table_schema.20001_20050.cpp
View File

@ -160,7 +160,7 @@ int ObInnerTableSchema::schemata_schema(ObTableSchema &table_schema)
table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT 'def' AS CATALOG_NAME, DATABASE_NAME AS SCHEMA_NAME, 'utf8mb4' AS DEFAULT_CHARACTER_SET_NAME, 'utf8mb4_general_ci' AS DEFAULT_COLLATION_NAME, NULL AS SQL_PATH, 'NO' as DEFAULT_ENCRYPTION FROM oceanbase.__all_database a WHERE a.tenant_id = 0 and in_recyclebin = 0 and database_name != '__recyclebin' )__"))) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT 'def' AS CATALOG_NAME, DATABASE_NAME AS SCHEMA_NAME, b.charset AS DEFAULT_CHARACTER_SET_NAME, b.collation AS DEFAULT_COLLATION_NAME, NULL AS SQL_PATH, 'NO' as DEFAULT_ENCRYPTION FROM oceanbase.__all_database a left join oceanbase.__tenant_virtual_collation b ON a.collation_type = b.collation_type WHERE a.tenant_id = 0 and in_recyclebin = 0 and database_name != '__recyclebin' )__"))) {
LOG_ERROR("fail to set view_definition", K(ret));
}
}

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

@ -11808,11 +11808,11 @@ def_table_schema(
view_definition = """
SELECT 'def' AS CATALOG_NAME,
DATABASE_NAME AS SCHEMA_NAME,
'utf8mb4' AS DEFAULT_CHARACTER_SET_NAME,
'utf8mb4_general_ci' AS DEFAULT_COLLATION_NAME,
b.charset AS DEFAULT_CHARACTER_SET_NAME,
b.collation AS DEFAULT_COLLATION_NAME,
NULL AS SQL_PATH,
'NO' as DEFAULT_ENCRYPTION
FROM oceanbase.__all_database a
FROM oceanbase.__all_database a left join oceanbase.__tenant_virtual_collation b ON a.collation_type = b.collation_type
WHERE a.tenant_id = 0
and in_recyclebin = 0
and database_name != '__recyclebin'