[KYUUBI #7305] Fix DBeaver connect returned all tables. return tables… #7307

zhzhenqin · 2026-01-15T03:18:45Z

return tables from current database now! doris/starrocks like mysql

…tables from current database now

Copilot

Pull request overview

This PR fixes an issue where DBeaver connecting to Kyuubi would return all tables from all databases instead of just the current database. The fix specifically addresses the behavior when the schema parameter is "%" by modifying the query to filter by the current database using the database() function.

Changes:

Modified MySQLDialect.getTablesQuery() to handle the "%" schema pattern by filtering to the current database
Added getSchemasOperation() override to MySQLDialect to return the current database
Added getCatalogsOperation() override to StarRocksDialect to use "show catalogs" command

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 6 comments.

File	Description
MySQLDialect.scala	Added getSchemasOperation method and updated getTablesQuery to filter by current database when schema is "%" or blank
StarRocksDialect.scala	Added getCatalogsOperation method to return "show catalogs" command

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-15T08:26:05Z

...s/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/dialect/MySQLDialect.scala

  }

+  override def getSchemasOperation(catalog: String, schema: String): String = {
+    return "select database()"


Explicit return statements are not idiomatic in Scala. Remove the 'return' keyword and let the expression be the implicit return value.

Suggested change

return "select database()"

"select database()"

Copilot · 2026-01-15T08:26:05Z

...uubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/dialect/StarRocksDialect.scala

+  override def getCatalogsOperation(): String = {
+    return "show catalogs"
+  }


Explicit return statements are not idiomatic in Scala. Remove the 'return' keyword and let the expression be the implicit return value.

Suggested change

override def getCatalogsOperation(): String = {

return "show catalogs"

}

override def getCatalogsOperation(): String = "show catalogs"

Copilot · 2026-01-15T08:26:06Z

...uubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/dialect/StarRocksDialect.scala


  override def getSchemaHelper(): SchemaHelper = new StarRocksSchemaHelper

+


There is an unnecessary blank line before this method. Remove the extra blank line to maintain consistent spacing with other methods in the class.

Suggested change

Copilot · 2026-01-15T08:26:06Z

...s/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/dialect/MySQLDialect.scala

    }

-    if (StringUtils.isNotBlank(schema)) {
+    // when DBeaver connect use %, kyuubi to return all tables from all other databases.


Corrected grammar in comment: 'use' should be 'uses', and the sentence structure should be improved for clarity. Suggested: 'when DBeaver connects using %, Kyuubi returns all tables from all databases.'

Suggested change

// when DBeaver connect use %, kyuubi to return all tables from all other databases.

// when DBeaver connects using %, Kyuubi returns all tables from all databases.

Copilot · 2026-01-15T08:26:07Z

...s/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/dialect/MySQLDialect.scala

+    if (StringUtils.isNotBlank(schema) && !"%".equals(schema)) {
      filters += s"$TABLE_SCHEMA LIKE '$schema'"
+    } else {
+      filters += s"$TABLE_SCHEMA = database()"


The condition combines two separate cases: when schema is blank and when schema is '%'. This logic would be clearer if split into separate conditions to distinguish between 'schema is blank' and 'schema is %' cases. Consider restructuring as: if blank -> database(), else if '%' -> database(), else -> LIKE schema.

Suggested change

if (StringUtils.isNotBlank(schema) && !"%".equals(schema)) {

filters += s"$TABLE_SCHEMA LIKE '$schema'"

} else {

filters += s"$TABLE_SCHEMA = database()"

if (StringUtils.isBlank(schema)) {

// No schema provided: default to current database

filters += s"$TABLE_SCHEMA = database()"

} else if ("%".equals(schema)) {

// '%' means all schemas: do not add TABLE_SCHEMA filter

} else {

filters += s"$TABLE_SCHEMA LIKE '$schema'"

Copilot · 2026-01-15T08:26:07Z

...s/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/dialect/MySQLDialect.scala

  }

+  override def getSchemasOperation(catalog: String, schema: String): String = {
+    return "select database()"


The method accepts catalog and schema parameters but doesn't use them. This implementation ignores the parameters entirely, which may not be the expected behavior for all use cases. Consider documenting this behavior or validating if the parameters should influence the query.

Suggested change

return "select database()"

// MySQLDialect currently returns only the current database as the schema.

// The catalog and schema parameters are accepted for interface compatibility

// but do not influence the generated query.

if (StringUtils.isNotBlank(catalog) || StringUtils.isNotBlank(schema)) {

// Parameters are intentionally ignored; behavior is to always return the current database.

}

"select database()"

codecov-commenter · 2026-01-15T09:38:37Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 0.00%. Comparing base (b49ef79) to head (807a9b2).

Additional details and impacted files

@@          Coverage Diff           @@
##           master   #7307   +/-   ##
======================================
  Coverage    0.00%   0.00%           
======================================
  Files         698     698           
  Lines       43648   43648           
  Branches     5894    5894           
======================================
  Misses      43648   43648

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

pan3793 · 2026-01-15T10:04:09Z

...s/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/dialect/MySQLDialect.scala


-    if (StringUtils.isNotBlank(schema)) {
+    // when DBeaver connect use %, kyuubi to return all tables from all other databases.
+    if (StringUtils.isNotBlank(schema) && !"%".equals(schema)) {


I don't understand this change, I suppose WHERE $TABLE_SCHEMA LIKE '%' has the same effect as an empty condition

like MySQLDialect(mysql, doris, starrocks) use:

SELECT TABLE_CATALOG, TABLE_SCHEMA, TABLE_NAME, TABLE_TYPE, ENGINE,
TABLE_ROWS, AVG_ROW_LENGTH, DATA_LENGTH,
CREATE_TIME, UPDATE_TIME, TABLE_COLLATION, TABLE_COMMENT
FROM INFORMATION_SCHEMA.TABLES

当 Dbeaver 连接时，会采用 % 作为参数，这样或造成返回给 Dbeaver 所有库下的所有的表。

和session配置的DB 不符，用户看到了其他数据库下的表（所有表）；

Dbeaver 在执行查询时，schema 不对，查询报错；

When connecting with Dbeaver, it uses '%' as a parameter, which may cause Dbeaver to return tables from all databases.

The database configuration may differ from the session's database, resulting in tables from other databases being displayed;

Dbeaver may encounter query errors due to an incorrect schema.

you can see issue: #7305

My StarRocks database "dataeye_starpony" only has 2 tables. However, DBeaver shows many more tables, and these extra tables cannot be queried.

[KYUUBI apache#7305] Fix DBeaver connect returned all tables. return …

807a9b2

…tables from current database now

github-actions bot added the module:jdbc label Jan 15, 2026

cxzl25 requested a review from Copilot January 15, 2026 08:22

Copilot started reviewing on behalf of cxzl25 January 15, 2026 08:23 View session

Copilot AI reviewed Jan 15, 2026

View reviewed changes

pan3793 reviewed Jan 15, 2026

View reviewed changes

zhzhenqin requested a review from pan3793 January 15, 2026 11:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[KYUUBI #7305] Fix DBeaver connect returned all tables. return tables… #7307

[KYUUBI #7305] Fix DBeaver connect returned all tables. return tables… #7307

zhzhenqin commented Jan 15, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jan 15, 2026

Uh oh!

Copilot AI Jan 15, 2026

Uh oh!

Copilot AI Jan 15, 2026

Uh oh!

Copilot AI Jan 15, 2026

Uh oh!

Copilot AI Jan 15, 2026

Uh oh!

Copilot AI Jan 15, 2026

Uh oh!

codecov-commenter commented Jan 15, 2026

Uh oh!

pan3793 Jan 15, 2026

Uh oh!

zhzhenqin Jan 15, 2026

Uh oh!

zhzhenqin Jan 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants


		override def getSchemaHelper(): SchemaHelper = new StarRocksSchemaHelper

	// when DBeaver connect use %, kyuubi to return all tables from all other databases.
	// when DBeaver connects using %, Kyuubi returns all tables from all databases.

-    return "select database()"
+    // MySQLDialect currently returns only the current database as the schema.
+    // The catalog and schema parameters are accepted for interface compatibility
+    // but do not influence the generated query.
+    if (StringUtils.isNotBlank(catalog) || StringUtils.isNotBlank(schema)) {
+      // Parameters are intentionally ignored; behavior is to always return the current database.
+    }
+    "select database()"

[KYUUBI #7305] Fix DBeaver connect returned all tables. return tables… #7307

Are you sure you want to change the base?

[KYUUBI #7305] Fix DBeaver connect returned all tables. return tables… #7307

Conversation

zhzhenqin commented Jan 15, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

codecov-commenter commented Jan 15, 2026

Codecov Report

Uh oh!

pan3793 Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

zhzhenqin Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

zhzhenqin Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants