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(editor): 快速开始页打开查询时带入默认 schema

zipg04ba5f01e569
diff --git a/apps/desktop/src/App.vue b/apps/desktop/src/App.vue
index 35051a1939..4e735511c9 100644
--- a/apps/desktop/src/App.vue
+++ b/apps/desktop/src/App.vue
@@ -3383,13 +3383,18 @@ async function openConnectionQuery(connectionId: string) {
}
return;
}
- const tabId = queryStore.createTab(connectionId, initialTarget.database);
+ // The quick-start page opens a query directly, bypassing newQuery() and its
+ // default-schema fallback. Pass the configured schema here too, otherwise an
+ // Oracle connection with a default schema opens the editor without a session
+ // schema and unqualified tables resolve against the session default (#11844).
+ const tabId = queryStore.createTab(connectionId, initialTarget.database, undefined, "query", initialTarget.schema);
try {
await connectionStore.ensureConnected(connectionId);
const options = await getDatabaseOptions(connectionId);
const target = quickConnectionOpenTarget(connection, options);
if (target.kind === "query") {
queryStore.updateDatabase(tabId, target.database);
+ if (target.schema) queryStore.updateSchema(tabId, target.schema);
}
} catch (e: any) {
toast(
diff --git a/apps/desktop/src/lib/__tests__/connection/connectionOpenTarget.spec.ts b/apps/desktop/src/lib/__tests__/connection/connectionOpenTarget.spec.ts
index f423168052..1f75c7699f 100644
--- a/apps/desktop/src/lib/__tests__/connection/connectionOpenTarget.spec.ts
+++ b/apps/desktop/src/lib/__tests__/connection/connectionOpenTarget.spec.ts
@@ -42,4 +42,12 @@ describe("quickConnectionOpenTarget", () => {
database: "app",
});
});
+
+ it("carries the connection's default schema into the query tab (#11844)", () => {
+ expect(quickConnectionOpenTarget({ ...connection("oracle"), database: "XE", default_schema: "REPORTING" })).toEqual({
+ kind: "query",
+ database: "XE",
+ schema: "REPORTING",
+ });
+ });
});
diff --git a/apps/desktop/src/lib/connection/connectionOpenTarget.ts b/apps/desktop/src/lib/connection/connectionOpenTarget.ts
index dd5c1cdf99..a3bfc823fa 100644
--- a/apps/desktop/src/lib/connection/connectionOpenTarget.ts
+++ b/apps/desktop/src/lib/connection/connectionOpenTarget.ts
@@ -1,9 +1,9 @@
import type { ConnectionConfig } from "@/types/database";
import { resolveDefaultDatabase } from "@/lib/database/defaultDatabase";
-export type QuickConnectionOpenTarget = { kind: "mq-admin" } | { kind: "nacos-admin" } | { kind: "plugin-workbench" } | { kind: "etcd" } | { kind: "zookeeper" } | { kind: "consul" } | { kind: "query"; database: string };
+export type QuickConnectionOpenTarget = { kind: "mq-admin" } | { kind: "nacos-admin" } | { kind: "plugin-workbench" } | { kind: "etcd" } | { kind: "zookeeper" } | { kind: "consul" } | { kind: "query"; database: string; schema?: string };
-export function quickConnectionOpenTarget(connection: Pick<ConnectionConfig, "db_type" | "database">, databaseOptions: string[] = []): QuickConnectionOpenTarget {
+export function quickConnectionOpenTarget(connection: Pick<ConnectionConfig, "db_type" | "database" | "default_schema">, databaseOptions: string[] = []): QuickConnectionOpenTarget {
if (connection.db_type === "mq") {
return { kind: "mq-admin" };
}
@@ -22,5 +22,5 @@ export function quickConnectionOpenTarget(connection: Pick<ConnectionConfig, "db
if (connection.db_type === "consul") {
return { kind: "consul" };
}
- return { kind: "query", database: resolveDefaultDatabase(connection, databaseOptions) };
+ return { kind: "query", database: resolveDefaultDatabase(connection, databaseOptions), schema: connection.default_schema };
}