25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
fix(metadata): scope schemas to current catalog
t8y2776d01199c7d
diff --git a/agents/common/src/main/java/com/dbx/agent/ConfiguredJdbcAgent.java b/agents/common/src/main/java/com/dbx/agent/ConfiguredJdbcAgent.javaindex dfbb04824b..64b09cf831 100644--- a/agents/common/src/main/java/com/dbx/agent/ConfiguredJdbcAgent.java+++ b/agents/common/src/main/java/com/dbx/agent/ConfiguredJdbcAgent.java@@ -47,7 +47,7 @@ public abstract class ConfiguredJdbcAgent extends AbstractJdbcAgent {@Overridepublic List<String> listSchemas() {- return StandardJdbcMetadata.INSTANCE.listSchemas(requireConnection(), profile);+ return StandardJdbcMetadata.INSTANCE.listSchemas(requireConnection(), profile, configuredDatabase);}@Overridediff --git a/agents/common/src/main/java/com/dbx/agent/StandardJdbcMetadata.java b/agents/common/src/main/java/com/dbx/agent/StandardJdbcMetadata.javaindex 8c1c9ab612..0750ea3cc4 100644--- a/agents/common/src/main/java/com/dbx/agent/StandardJdbcMetadata.java+++ b/agents/common/src/main/java/com/dbx/agent/StandardJdbcMetadata.java@@ -42,11 +42,23 @@ public final class StandardJdbcMetadata {}public List<String> listSchemas(Connection conn, JdbcAgentProfile profile) {+ return listSchemas(conn, profile, null);+ }++ public List<String> listSchemas(Connection conn, JdbcAgentProfile profile, String configuredCatalog) {return unchecked(() -> {Set<String> names = new LinkedHashSet<>();DatabaseMetaData meta = conn.getMetaData();+ String catalog = blankToNull(configuredCatalog);+ try {+ String currentCatalog = conn.getCatalog();+ if (currentCatalog != null && !currentCatalog.trim().isEmpty()) {+ catalog = currentCatalog.trim();+ }+ } catch (Exception | AbstractMethodError ignored) {+ }try {- appendSchemas(names, meta.getSchemas(null, null));+ appendSchemas(names, meta.getSchemas(catalog, null));} catch (Exception | AbstractMethodError first) {try {appendSchemas(names, meta.getSchemas());diff --git a/agents/common/src/test/java/com/dbx/agent/StandardJdbcMetadataTest.java b/agents/common/src/test/java/com/dbx/agent/StandardJdbcMetadataTest.javaindex 722980bc19..7932384d50 100644--- a/agents/common/src/test/java/com/dbx/agent/StandardJdbcMetadataTest.java+++ b/agents/common/src/test/java/com/dbx/agent/StandardJdbcMetadataTest.java@@ -43,6 +43,37 @@ class StandardJdbcMetadataTest {assertEquals(Arrays.asList("APP", "PUBLIC"), StandardJdbcMetadata.INSTANCE.listSchemas(conn, profile));}+ @Test+ void scopesSchemasToTheConnectionCatalog() {+ AtomicReference<Object[]> capturedArgs = new AtomicReference<>();+ DatabaseMetaData meta = proxy(DatabaseMetaData.class, new MethodHandler() {+ @Override+ public Object handle(Method method, Object[] args) {+ if ("getSchemas".equals(method.getName())) {+ capturedArgs.set(args);+ return rows(row("TABLE_SCHEM", "APP"));+ }+ return defaultValue(method.getReturnType());+ }+ });+ Connection conn = proxy(Connection.class, new MethodHandler() {+ @Override+ public Object handle(Method method, Object[] args) {+ if ("getMetaData".equals(method.getName())) {+ return meta;+ }+ if ("getCatalog".equals(method.getName())) {+ return "regular_catalog";+ }+ return defaultValue(method.getReturnType());+ }+ });++ assertEquals(List.of("APP"), StandardJdbcMetadata.INSTANCE.listSchemas(conn, profile, "initial_catalog"));+ assertEquals("regular_catalog", capturedArgs.get()[0]);+ assertEquals(null, capturedArgs.get()[1]);+ }+@Testvoid listsSchemasWhenConnectionGetSchemaIsUnsupported() {Connection conn = connection(