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(sundb): resolve mixed-case table metadata via driver retry

zipg318c8221d1b2
diff --git a/agents/common/src/main/java/com/dbx/agent/JdbcAgentProfile.java b/agents/common/src/main/java/com/dbx/agent/JdbcAgentProfile.java
index 75c402ade4..65beed609a 100644
--- a/agents/common/src/main/java/com/dbx/agent/JdbcAgentProfile.java
+++ b/agents/common/src/main/java/com/dbx/agent/JdbcAgentProfile.java
@@ -162,6 +162,17 @@ public class JdbcAgentProfile {
return catalogFallbackEnabled;
}
+ /**
+ * Whether table metadata lookups should retry with a unique case-insensitive table name match.
+ *
+ * <p>Most JDBC drivers treat the table pattern passed to {@code DatabaseMetaData} as a
+ * pattern with driver-defined case rules. Drivers that expose case-insensitive SQL name
+ * resolution but case-sensitive metadata patterns can opt into this fallback.</p>
+ */
+ public boolean getCaseInsensitiveTableMetadata() {
+ return false;
+ }
+
public boolean getNativeTableDdlSupported() {
return nativeTableDdlSupported;
}
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 3aad94b0ef..98478f66e7 100644
--- a/agents/common/src/main/java/com/dbx/agent/StandardJdbcMetadata.java
+++ b/agents/common/src/main/java/com/dbx/agent/StandardJdbcMetadata.java
@@ -216,13 +216,42 @@ public final class StandardJdbcMetadata {
Set<String> primaryKeys = primaryKeys(meta, null, schema, table);
List<ColumnInfo> result = new ArrayList<>();
appendColumns(result, meta, null, schema, table, primaryKeys);
+
+ // Some drivers resolve table names case-insensitively in SQL but use the exact
+ // table pattern for DatabaseMetaData. Retry only when the driver opts in and
+ // getTables() identifies one unambiguous table name.
+ if (profile.getCaseInsensitiveTableMetadata() && (result.isEmpty() || primaryKeys.isEmpty())) {
+ String resolvedTable = resolveCaseInsensitiveTableName(meta, profile, null, schema, table);
+ if (resolvedTable != null && !resolvedTable.equals(table)) {
+ Set<String> resolvedPrimaryKeys = primaryKeys(meta, null, schema, resolvedTable);
+ if (result.isEmpty()) {
+ appendColumns(result, meta, null, schema, resolvedTable, resolvedPrimaryKeys);
+ } else {
+ markPrimaryKeys(result, resolvedPrimaryKeys);
+ }
+ }
+ }
+
if (!result.isEmpty() && primaryKeys.isEmpty() && profile.getCatalogFallbackEnabled() && hasConfiguredDatabase(configuredDatabase)) {
Set<String> fallbackPrimaryKeys = primaryKeys(meta, configuredDatabase, schema, table);
+ if (profile.getCaseInsensitiveTableMetadata() && fallbackPrimaryKeys.isEmpty()) {
+ String resolvedTable = resolveCaseInsensitiveTableName(meta, profile, configuredDatabase, schema, table);
+ if (resolvedTable != null && !resolvedTable.equals(table)) {
+ fallbackPrimaryKeys = primaryKeys(meta, configuredDatabase, schema, resolvedTable);
+ }
+ }
markPrimaryKeys(result, fallbackPrimaryKeys);
}
if (result.isEmpty() && profile.getCatalogFallbackEnabled() && hasConfiguredDatabase(configuredDatabase)) {
Set<String> fallbackPrimaryKeys = primaryKeys(meta, configuredDatabase, schema, table);
appendColumns(result, meta, configuredDatabase, schema, table, fallbackPrimaryKeys);
+ if (result.isEmpty() && profile.getCaseInsensitiveTableMetadata()) {
+ String resolvedTable = resolveCaseInsensitiveTableName(meta, profile, configuredDatabase, schema, table);
+ if (resolvedTable != null && !resolvedTable.equals(table)) {
+ Set<String> resolvedPrimaryKeys = primaryKeys(meta, configuredDatabase, schema, resolvedTable);
+ appendColumns(result, meta, configuredDatabase, schema, resolvedTable, resolvedPrimaryKeys);
+ }
+ }
}
return result;
});
@@ -237,8 +266,20 @@ public final class StandardJdbcMetadata {
) {
return unchecked(() -> {
List<IndexInfo> result = listIndexesInternal(conn, null, schema, table);
+ if (result.isEmpty() && profile.getCaseInsensitiveTableMetadata()) {
+ String resolvedTable = resolveCaseInsensitiveTableName(conn.getMetaData(), profile, null, schema, table);
+ if (resolvedTable != null && !resolvedTable.equals(table)) {
+ result = listIndexesInternal(conn, null, schema, resolvedTable);
+ }
+ }
if (result.isEmpty() && profile.getCatalogFallbackEnabled() && hasConfiguredDatabase(configuredDatabase)) {
result = listIndexesInternal(conn, configuredDatabase, schema, table);
+ if (result.isEmpty() && profile.getCaseInsensitiveTableMetadata()) {
+ String resolvedTable = resolveCaseInsensitiveTableName(conn.getMetaData(), profile, configuredDatabase, schema, table);
+ if (resolvedTable != null && !resolvedTable.equals(table)) {
+ result = listIndexesInternal(conn, configuredDatabase, schema, resolvedTable);
+ }
+ }
}
return result;
});
@@ -592,6 +633,36 @@ public final class StandardJdbcMetadata {
return keys;
}
+ private String resolveCaseInsensitiveTableName(
+ DatabaseMetaData meta,
+ JdbcAgentProfile profile,
+ String catalog,
+ String schema,
+ String requestedTable
+ ) {
+ if (requestedTable == null || requestedTable.trim().isEmpty()) {
+ return null;
+ }
+ Set<String> matches = new LinkedHashSet<>();
+ String[] tableTypes;
+ try {
+ tableTypes = getDriverTableTypes(meta, profile);
+ } catch (Exception ignored) {
+ tableTypes = profile.getTableTypes().toArray(new String[0]);
+ }
+ try (ResultSet rs = meta.getTables(blankToNull(catalog), blankToNull(schema), "%", tableTypes)) {
+ while (rs.next()) {
+ String name = rs.getString("TABLE_NAME");
+ if (name != null && name.equalsIgnoreCase(requestedTable)) {
+ matches.add(name);
+ }
+ }
+ } catch (Exception ignored) {
+ return null;
+ }
+ return matches.size() == 1 ? matches.iterator().next() : null;
+ }
+
private static boolean hasConfiguredDatabase(String configuredDatabase) {
return configuredDatabase != null && !configuredDatabase.trim().isEmpty();
}
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 67b37a0731..2c707c2278 100644
--- a/agents/common/src/test/java/com/dbx/agent/StandardJdbcMetadataTest.java
+++ b/agents/common/src/test/java/com/dbx/agent/StandardJdbcMetadataTest.java
@@ -469,6 +469,80 @@ class StandardJdbcMetadataTest {
assertEquals(Integer.valueOf(64), columns.get(1).getCharacter_maximum_length());
}
+ @Test
+ void retriesCaseInsensitiveTableMetadataWithTheCanonicalTableName() {
+ JdbcAgentProfile caseInsensitiveProfile = new JdbcAgentProfile(
+ "example.Driver",
+ "jdbc:example://{host}:{port}/{database}",
+ 0,
+ false,
+ Collections.emptySet(),
+ Collections.singletonList("TABLE")
+ ) {
+ @Override
+ public boolean getCaseInsensitiveTableMetadata() {
+ return true;
+ }
+ };
+ DatabaseMetaData meta = proxy(DatabaseMetaData.class, new MethodHandler() {
+ @Override
+ public Object handle(Method method, Object[] args) {
+ String name = method.getName();
+ if ("getTables".equals(name)) {
+ return rows(row("TABLE_NAME", "ORDERS"));
+ }
+ if ("getPrimaryKeys".equals(name)) {
+ return "ORDERS".equals(args[2]) ? rows(row("COLUMN_NAME", "ID")) : rows();
+ }
+ if ("getColumns".equals(name)) {
+ return "ORDERS".equals(args[2]) ? rows(row(
+ "COLUMN_NAME", "ID",
+ "TYPE_NAME", "INTEGER",
+ "NULLABLE", DatabaseMetaData.columnNoNulls,
+ "COLUMN_SIZE", 10,
+ "DECIMAL_DIGITS", 0
+ )) : rows();
+ }
+ if ("getIndexInfo".equals(name)) {
+ return "ORDERS".equals(args[2]) ? rows(row(
+ "INDEX_NAME", "PK_ORDERS",
+ "COLUMN_NAME", "ID",
+ "ORDINAL_POSITION", (short) 1,
+ "NON_UNIQUE", false
+ )) : rows();
+ }
+ return defaultValue(method.getReturnType());
+ }
+ });
+ Connection conn = proxy(Connection.class, new MethodHandler() {
+ @Override
+ public Object handle(Method method, Object[] args) {
+ return "getMetaData".equals(method.getName()) ? meta : defaultValue(method.getReturnType());
+ }
+ });
+
+ List<ColumnInfo> columns = StandardJdbcMetadata.INSTANCE.getColumns(
+ conn,
+ caseInsensitiveProfile,
+ null,
+ "APP",
+ "orders"
+ );
+ List<IndexInfo> indexes = StandardJdbcMetadata.INSTANCE.listIndexes(
+ conn,
+ caseInsensitiveProfile,
+ null,
+ "APP",
+ "orders"
+ );
+
+ assertEquals(1, columns.size());
+ assertEquals("ID", columns.get(0).getName());
+ assertTrue(columns.get(0).getIs_primary_key());
+ assertEquals(1, indexes.size());
+ assertEquals(Collections.singletonList("ID"), indexes.get(0).getColumns());
+ }
+
@Test
void marksPrimaryKeysFromConfiguredCatalogWhenColumnsAlreadyLoaded() {
Connection conn = catalogPrimaryKeyFallbackConnection(
diff --git a/agents/drivers/sundb/src/main/java/com/dbx/agent/sundb/SundbAgent.java b/agents/drivers/sundb/src/main/java/com/dbx/agent/sundb/SundbAgent.java
index 073cf0dbdd..f62c3d14cb 100644
--- a/agents/drivers/sundb/src/main/java/com/dbx/agent/sundb/SundbAgent.java
+++ b/agents/drivers/sundb/src/main/java/com/dbx/agent/sundb/SundbAgent.java
@@ -19,7 +19,12 @@ public final class SundbAgent extends ConfiguredJdbcAgent {
"csii.sundb.jdbc.SundbDriver",
"jdbc:sundb://{host}:{port}/{database}",
22581
- );
+ ) {
+ @Override
+ public boolean getCaseInsensitiveTableMetadata() {
+ return true;
+ }
+ };
public SundbAgent() {
super(SUNDB_PROFILE);
diff --git a/agents/drivers/sundb/src/test/java/com/dbx/agent/sundb/SundbAgentMetadataTest.java b/agents/drivers/sundb/src/test/java/com/dbx/agent/sundb/SundbAgentMetadataTest.java
index 84fedcc519..0bed15b7c6 100644
--- a/agents/drivers/sundb/src/test/java/com/dbx/agent/sundb/SundbAgentMetadataTest.java
+++ b/agents/drivers/sundb/src/test/java/com/dbx/agent/sundb/SundbAgentMetadataTest.java
@@ -123,6 +123,7 @@ class SundbAgentMetadataTest {
void buildsSunDbJdbcUrlFromProfileTemplate() {
Assertions.assertEquals("csii.sundb.jdbc.SundbDriver", SundbAgent.SUNDB_PROFILE.getDriverClass());
Assertions.assertEquals(22581, SundbAgent.SUNDB_PROFILE.getDefaultPort());
+ Assertions.assertTrue(SundbAgent.SUNDB_PROFILE.getCaseInsensitiveTableMetadata());
ConnectParams params = new ConnectParams();
params.setHost("10.0.0.1");