This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 012848060b2 branch-2.1: [fix](test) Fix mysql catalog check db test
#46263 (#46343)
012848060b2 is described below
commit 012848060b2d1e6f656c4c6d198d0bbd6f1707a8
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Jan 4 10:45:26 2025 +0800
branch-2.1: [fix](test) Fix mysql catalog check db test #46263 (#46343)
Cherry-picked from #46263
Co-authored-by: zy-kkk <[email protected]>
---
.../jdbc/test_mysql_jdbc_catalog.out | 20 --------------------
.../jdbc/test_mysql_jdbc_catalog.groovy | 10 +++++++++-
2 files changed, 9 insertions(+), 21 deletions(-)
diff --git
a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out
b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out
index 7860610445d..bdfe71c6ee6 100644
--- a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out
+++ b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out
@@ -375,16 +375,6 @@ year smallint Yes false \N NONE
-- !auto_default_t2 --
0
--- !sql_show_db_from_lower_case --
-doris_1
-doris_2
-doris_3
-doris_test
-information_schema
-init_db
-mysql
-show_test_do_not_modify
-
-- !sql_show_tbl_from_lower_case --
doris_1
doris_2
@@ -818,16 +808,6 @@ year smallint Yes false \N NONE
-- !auto_default_t2 --
0
--- !sql_show_db_from_lower_case --
-doris_1
-doris_2
-doris_3
-doris_test
-information_schema
-init_db
-mysql
-show_test_do_not_modify
-
-- !sql_show_tbl_from_lower_case --
doris_1
doris_2
diff --git
a/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy
b/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy
index 637312edec7..3e0e815974f 100644
---
a/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy
+++
b/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy
@@ -544,7 +544,15 @@ suite("test_mysql_jdbc_catalog",
"p0,external,mysql,external_docker,external_doc
);
"""
- qt_sql_show_db_from_lower_case "show databases from
mysql_lower_case_catalog;"
+ test {
+ sql """ show databases from mysql_lower_case_catalog; """
+ check { result, ex, startTime, endTime ->
+ def expectedDatabases = ["doris_1", "doris_2", "doris_3"]
+ expectedDatabases.each { dbName ->
+ assertTrue(result.collect { it[0] }.contains(dbName),
"Expected database '${dbName}' not found in result")
+ }
+ }
+ }
qt_sql_show_tbl_from_lower_case "show tables from
mysql_lower_case_catalog.doris_2;"
qt_sql1_from_lower_case "select * from
mysql_lower_case_catalog.doris_2.doris_1 order by id;"
qt_sql2_from_lower_case "select * from
mysql_lower_case_catalog.doris_2.doris_2 order by id;"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
