github/dbx
4
0
Fork 0
mirror of https://github.com/t8y2/dbx.git synced 2026-10-21 03:39:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(jdbc): use schema tree for inferred db2

Browse Source
This commit is contained in:
t8y2
2026-06-10 18:19:53 +08:00
parent d353d4673f
commit 7a0f89d3ad
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/desktop/src/lib/jdbcDialect.ts
+4 -2
View File
@@ -1,5 +1,5 @@
import type { ConnectionConfig, DatabaseType } from "@/types/database";
import { isSchemaAware, usesDatabaseObjectTreeMode } from "@/lib/databaseFeatureSupport";
import { isSchemaAware, usesDatabaseObjectTreeMode, usesTreeSchemaMode } from "@/lib/databaseFeatureSupport";
const JDBC_DIALECT_MATCHERS: Array<{ type: DatabaseType; patterns: RegExp[] }> = [
{ type: "databend", patterns: [/jdbc:databend:/i, /com\.databend\.jdbc\.DatabendDriver/i, /databend-jdbc/i] },
@@ -34,8 +34,10 @@ export function connectionUsesDatabaseObjectTreeMode(connection?: Pick<Connectio
if (!connection) return false;
if (connection.db_type !== "jdbc") return usesDatabaseObjectTreeMode(connection.db_type);
const dialect = inferJdbcDialect(connection);
if (!dialect) return true;
if (dialect === "hive" || dialect === "trino") return false;
return true;
if (dialect === "databend") return true;
return !usesTreeSchemaMode(dialect);
}
export function connectionUsesSchemaExecutionContext(connection?: Pick<ConnectionConfig, "db_type" | "connection_string" | "jdbc_driver_class" | "jdbc_driver_paths">): boolean {
packages/app-tests/jdbcDialect.test.ts
+4
View File
@@ -37,11 +37,15 @@ test("effective database type keeps non-JDBC types and enables compatible JDBC s
test("JDBC tree shape follows the inferred driver dialect", () => {
const kyuubi = { db_type: "jdbc" as const, jdbc_driver_class: "org.apache.kyuubi.jdbc.KyuubiHiveDriver" };
const hive = { db_type: "jdbc" as const, jdbc_driver_class: "org.apache.hive.jdbc.HiveDriver" };
const db2 = { db_type: "jdbc" as const, connection_string: "jdbc:db2://db.example.com:50000/SAMPLE" };
assert.equal(connectionUsesDatabaseObjectTreeMode(kyuubi), true);
assert.equal(connectionObjectTreeQuerySchema(kyuubi, "test", undefined), "");
assert.equal(connectionUsesDatabaseObjectTreeMode(hive), false);
assert.equal(connectionObjectTreeQuerySchema(hive, "spark_catalog", "test"), "test");
assert.equal(connectionUsesDatabaseObjectTreeMode(db2), false);
assert.equal(connectionObjectTreeQuerySchema(db2, "SAMPLE", "APP"), "APP");
assert.equal(connectionObjectTreeNodeSchema(db2, "SAMPLE", "APP"), "APP");
assert.equal(
qualifiedTableName({
databaseType: effectiveDatabaseTypeForConnection(hive),