[shardingsphere] branch master updated: Fix querying information_schema.schemata on MySQL (#27620)

[duanzhengqiang]

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new b83e59a7b7a Fix querying information_schema.schemata on MySQL (#27620)
b83e59a7b7a is described below

commit b83e59a7b7ab27ffe0c39d6855d62025b1441885
Author: Feng Zhang <f...@spaceandtime.io>
AuthorDate: Wed Aug 2 01:02:01 2023 -0700

    Fix querying information_schema.schemata on MySQL (#27620)
    
    * Fix querying information_schema.schemata on MySQL
    
    * add new line
    
    * add back e2e sql test case
---
 .../main/resources/schema/mysql/information_schema/schemata.yaml  | 8 ++++++++
 .../dql/dataset/db/select_mysql_information_schema_schemata.xml   | 1 +
 .../cases/dql/dql-integration-select-system-schema-mysql.xml      | 7 +++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git 
a/infra/common/src/main/resources/schema/mysql/information_schema/schemata.yaml 
b/infra/common/src/main/resources/schema/mysql/information_schema/schemata.yaml
index 35123d119d2..4f04458187d 100644
--- 
a/infra/common/src/main/resources/schema/mysql/information_schema/schemata.yaml
+++ 
b/infra/common/src/main/resources/schema/mysql/information_schema/schemata.yaml
@@ -57,3 +57,11 @@ columns:
     primaryKey: false
     unsigned: false
     visible: true
+  default_encryption:
+    caseSensitive: false
+    dataType: 12
+    generated: false
+    name: DEFAULT_ENCRYPTION
+    primaryKey: false
+    unsigned: false
+    visible: true
diff --git 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_mysql_information_schema_schemata.xml
 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_mysql_information_schema_schemata.xml
index 15585cf0c84..690ace345de 100644
--- 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_mysql_information_schema_schemata.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_mysql_information_schema_schemata.xml
@@ -22,5 +22,6 @@
         <column name="default_character_set_name" />
         <column name="default_collation_name" />
         <column name="sql_path" />
+        <column name="default_encryption" />        
     </metadata>
 </dataset>
diff --git 
a/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-system-schema-mysql.xml
 
b/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-system-schema-mysql.xml
index bd88dcafc7c..e5caa7956d2 100644
--- 
a/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-system-schema-mysql.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-system-schema-mysql.xml
@@ -205,10 +205,9 @@
         <assertion 
expected-data-file="select_mysql_information_schema_schema_privileges.xml" />
     </test-case>
     
-    <!-- FIXME issue #25899 -->
-    <!--    <test-case sql="SELECT * FROM information_schema.schemata" 
db-types="MySQL" scenario-types="db">-->
-    <!--        <assertion 
expected-data-file="select_mysql_information_schema_schemata.xml" />-->
-    <!--    </test-case>-->
+    <test-case sql="SELECT * FROM information_schema.schemata" 
db-types="MySQL" scenario-types="db">
+        <assertion 
expected-data-file="select_mysql_information_schema_schemata.xml" />
+    </test-case>
 
     <test-case sql="SELECT * FROM information_schema.session_status" 
db-types="MySQL" scenario-types="db">
         <assertion 
expected-data-file="select_mysql_information_schema_session_status.xml" />