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(schema-diff): load Oracle namespace options

Eve0854cc3e08ef
diff --git a/apps/desktop/src/components/diff/SchemaDiffConfigStep.vue b/apps/desktop/src/components/diff/SchemaDiffConfigStep.vue
index df1565c0ef..67853c6f02 100644
--- a/apps/desktop/src/components/diff/SchemaDiffConfigStep.vue
+++ b/apps/desktop/src/components/diff/SchemaDiffConfigStep.vue
@@ -472,14 +472,7 @@ async function loadDatabases(connectionId: string, side: "source" | "target") {
try {
await store.ensureConnected(connectionId);
const config = store.getConfig(connectionId);
- let dbNames: string[];
- if (config?.db_type === "dameng") {
- // 达梦的"数据库"概念对应 schema,使用 fetchNamespaceOptionsForConnection
- dbNames = await fetchNamespaceOptionsForConnection(connectionId, config);
- } else {
- const dbs = await api.listDatabases(connectionId);
- dbNames = Array.isArray(dbs) ? dbs.map((db: any) => (typeof db === "string" ? db : db.name || db.database)) : [];
- }
+ const dbNames = config ? await fetchNamespaceOptionsForConnection(connectionId, config) : (await api.listDatabases(connectionId)).map((db) => db.name);
if (side === "source") {
sourceDatabases.value = dbNames;
if (props.sourceDatabase) {
diff --git a/apps/desktop/src/components/diff/__tests__/SchemaDiffConfigStep.namespace.spec.ts b/apps/desktop/src/components/diff/__tests__/SchemaDiffConfigStep.namespace.spec.ts
new file mode 100644
index 0000000000..5649de8b3e
--- /dev/null
+++ b/apps/desktop/src/components/diff/__tests__/SchemaDiffConfigStep.namespace.spec.ts
@@ -0,0 +1,84 @@
+// @vitest-environment happy-dom
+
+import { createApp, defineComponent, h, nextTick, type App } from "vue";
+import { afterEach, expect, it, vi } from "vitest";
+import i18n from "@/i18n";
+import { getDefaultOptionsForDbType } from "@/types/schemaDiff";
+import SchemaDiffConfigStep from "@/components/diff/SchemaDiffConfigStep.vue";
+
+const mocks = vi.hoisted(() => ({
+ ensureConnected: vi.fn().mockResolvedValue(undefined),
+ listDatabases: vi.fn().mockResolvedValue([]),
+ listSchemas: vi.fn().mockResolvedValue(["APP", "REPORTING"]),
+}));
+
+vi.mock("@/stores/connectionStore", () => {
+ const connection = { id: "oracle-11g", name: "Oracle 11g", db_type: "oracle", driver_profile: "oracle", database: "XE" };
+ return {
+ useConnectionStore: () => ({
+ connections: [connection],
+ sidebarLayout: { groups: [], order: [{ type: "connection", id: connection.id }] },
+ getConfig: (id: string) => (id === connection.id ? connection : undefined),
+ ensureConnected: mocks.ensureConnected,
+ }),
+ };
+});
+
+vi.mock("@/lib/backend/api", () => ({
+ listDatabases: mocks.listDatabases,
+ listSchemas: mocks.listSchemas,
+}));
+
+const mountedApps: App[] = [];
+
+async function flushAsyncSetup() {
+ for (let index = 0; index < 8; index += 1) {
+ await nextTick();
+ await new Promise((resolve) => setTimeout(resolve, 0));
+ }
+}
+
+afterEach(() => {
+ for (const app of mountedApps.splice(0)) app.unmount();
+ document.body.textContent = "";
+ vi.clearAllMocks();
+});
+
+it("offers Oracle schemas as schema-diff database choices", async () => {
+ const container = document.createElement("div");
+ document.body.append(container);
+ const app = createApp(
+ defineComponent({
+ setup: () => () =>
+ h(SchemaDiffConfigStep, {
+ configs: [],
+ activeConfigId: "",
+ sourceConnectionId: "oracle-11g",
+ sourceDatabase: "",
+ sourceSchema: "",
+ targetConnectionId: "",
+ targetDatabase: "",
+ targetSchema: "",
+ ignoreComments: false,
+ options: getDefaultOptionsForDbType("oracle"),
+ tableListLoader: { load: vi.fn().mockResolvedValue([]) },
+ loading: false,
+ recentConfigs: [],
+ }),
+ }),
+ );
+ mountedApps.push(app);
+ app.use(i18n);
+ app.mount(container);
+ await flushAsyncSetup();
+
+ const sourceDatabase = document.querySelector<HTMLButtonElement>("button.dbx-searchable-select-trigger");
+ expect(sourceDatabase?.disabled).toBe(false);
+ sourceDatabase?.click();
+ await flushAsyncSetup();
+
+ const options = [...document.querySelectorAll<HTMLButtonElement>(".dbx-searchable-select-list button")].map((button) => button.textContent?.trim());
+ expect(options).toEqual(expect.arrayContaining(["APP", "REPORTING"]));
+ expect(mocks.listDatabases).not.toHaveBeenCalled();
+ expect(mocks.listSchemas).toHaveBeenCalledWith("oracle-11g", "XE", true);
+});