Skip to content

armgit / dbx

Public Imported from GitHub
0

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。

fix(jdbc): escape exact parent table names in column completion (#13802)

efeiree11088b4f59e
diff --git a/agents/common/src/main/java/com/dbx/agent/StandardJdbcMetadata.java b/agents/common/src/main/java/com/dbx/agent/StandardJdbcMetadata.java
index beebb29b4d..c5a4a3e920 100644
--- a/agents/common/src/main/java/com/dbx/agent/StandardJdbcMetadata.java
+++ b/agents/common/src/main/java/com/dbx/agent/StandardJdbcMetadata.java
@@ -521,7 +521,7 @@ public final class StandardJdbcMetadata {
if (table == null || table.trim().isEmpty()) {
return;
}
- try (ResultSet rs = meta.getColumns(catalog, blankToNull(schema), table, completionPattern(meta, request))) {
+ try (ResultSet rs = meta.getColumns(catalog, blankToNull(schema), escapeSchemaPattern(meta, table, true), completionPattern(meta, request))) {
while (rs.next() && result.size() < limit) {
String name = rs.getString("COLUMN_NAME");
if (!completionNameMatches(name, request)) {
diff --git a/agents/common/src/test/java/com/dbx/agent/StandardJdbcMetadataTest.java b/agents/common/src/test/java/com/dbx/agent/StandardJdbcMetadataTest.java
index 1562a23bb4..03fc669f3e 100644
--- a/agents/common/src/test/java/com/dbx/agent/StandardJdbcMetadataTest.java
+++ b/agents/common/src/test/java/com/dbx/agent/StandardJdbcMetadataTest.java
@@ -801,6 +801,37 @@ class StandardJdbcMetadataTest {
}
}
+ @ParameterizedTest
+ @CsvSource(value = {
+ "/|A_B|A/_B",
+ "/|A%B|A/%B",
+ "/|A/B_%|A//B/_/%",
+ "\\|A\\B_%|A\\\\B\\_\\%",
+ "/|ACCOUNTS|ACCOUNTS",
+ "''|A_B|A_B"
+ }, delimiter = '|')
+ void completionEscapesExactParentTable(String escape, String table, String expectedPattern) {
+ DatabaseMetaData meta = proxy(DatabaseMetaData.class, (method, args) -> {
+ switch (method.getName()) {
+ case "getSearchStringEscape": return escape;
+ case "getColumns":
+ assertEquals(expectedPattern, args[2]);
+ assertEquals("ID%", args[3]);
+ return rows(row("TABLE_NAME", table, "COLUMN_NAME", "ID", "TYPE_NAME", "INTEGER"));
+ default: return defaultValue(method.getReturnType());
+ }
+ });
+ Connection conn = proxy(Connection.class, (method, args) ->
+ "getMetaData".equals(method.getName()) ? meta : defaultValue(method.getReturnType()));
+ CompletionAssistantRequest request = request("sales", "APP", "ID", Collections.singletonList(CompletionAssistantObjectKind.COLUMN), table);
+
+ CompletionAssistantResponse result = StandardJdbcMetadata.INSTANCE.completionAssistantSearch(conn, profile, "sales", request);
+
+ assertEquals(1, result.getCandidates().size());
+ assertEquals("ID", result.getCandidates().get(0).getName());
+ assertEquals(table, result.getCandidates().get(0).getParent_name());
+ }
+
private static Connection connection(
ResultSet schemas,
ResultSet tables,