fix(doris): complete external catalog suggestions

This commit is contained in:
t8y2 committed 2026-07-24 14:11:18 +08:00
1 parent 959943315f
commit 6b98c7ebf1
11 files changed
+254 -81

No files matched your search

@@ -49,6 +49,18 @@ function sqlServerConnection(): ConnectionConfig {
} as ConnectionConfig;
}
function dorisConnection(): ConnectionConfig {
return {
...postgresConnection(),
id: "doris-1",
name: "Doris",
db_type: "doris",
port: 9030,
username: "root",
database: "sales",
} as ConnectionConfig;
}
function deferred<T>() {
let resolve!: (value: T) => void;
const promise = new Promise<T>((res) => {
@@ -468,6 +480,72 @@ describe("connectionStore completion assistant", () => {
expect(maxActiveColumns).toBe(2);
});
it("keeps Doris table completion caches isolated by catalog", async () => {
const listTables = vi.fn(async (...args: unknown[]) => {
const catalog = args[7];
return [{ name: catalog ? "external_orders" : "internal_orders", table_type: "BASE TABLE", comment: null }];
});
vi.doMock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => false }));
vi.doMock("@/lib/backend/api", () => ({
checkConnectionHealth: vi.fn().mockResolvedValue(undefined),
listTables,
}));
const { useConnectionStore } = await import("@/stores/connectionStore");
const store = useConnectionStore();
store.connections = [dorisConnection()];
store.connectedIds.add("doris-1");
const internal = await store.listCompletionTables("doris-1", "sales", "orders", 20);
const external = await store.listCompletionTables("doris-1", "sales", "orders", 20, undefined, false, undefined, "hive_catalog");
expect(listTables).toHaveBeenNthCalledWith(1, "doris-1", "sales", "sales", "orders", 20);
expect(listTables).toHaveBeenNthCalledWith(2, "doris-1", "sales", "", "orders", 20, undefined, undefined, "hive_catalog");
expect(internal).toEqual([{ name: "internal_orders", catalog: undefined, type: "table" }]);
expect(external).toEqual([{ name: "external_orders", catalog: "hive_catalog", type: "table" }]);
expect(store.lookupLocalCompletionTables("doris-1", "sales", "", 20)).toEqual(internal);
expect(store.lookupLocalCompletionTables("doris-1", "sales", "", 20, undefined, "hive_catalog")).toEqual(external);
});
it("passes Doris catalog to column metadata and isolates same-name table caches", async () => {
const completionAssistantSearch = vi.fn().mockResolvedValue({ candidates: [], incomplete: false, fallback_used: false });
const getColumns = vi.fn(async (_connectionId: string, _database: string, _schema: string, _table: string, catalog?: string) => [
{
name: catalog ? "external_id" : "internal_id",
data_type: "BIGINT",
is_nullable: false,
column_default: null,
is_primary_key: true,
extra: null,
comment: null,
},
]);
vi.doMock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => false }));
vi.doMock("@/lib/backend/api", () => ({
checkConnectionHealth: vi.fn().mockResolvedValue(undefined),
completionAssistantSearch,
getColumns,
}));
const { useConnectionStore } = await import("@/stores/connectionStore");
const store = useConnectionStore();
store.connections = [dorisConnection()];
store.connectedIds.add("doris-1");
const internal = await store.listCompletionColumns("doris-1", "sales", "orders");
const external = await store.listCompletionColumns("doris-1", "sales", "orders", undefined, undefined, "hive_catalog");
expect(completionAssistantSearch).toHaveBeenCalledTimes(1);
expect(getColumns).toHaveBeenNthCalledWith(1, "doris-1", "sales", "sales", "orders", undefined, undefined);
expect(getColumns).toHaveBeenNthCalledWith(2, "doris-1", "sales", "sales", "orders", "hive_catalog", undefined);
expect(internal.map((column) => column.name)).toEqual(["internal_id"]);
expect(external.map((column) => column.name)).toEqual(["external_id"]);
expect(store.lookupLocalCompletionColumns("doris-1", "sales", "orders").map((column) => column.name)).toEqual(["internal_id"]);
expect(store.lookupLocalCompletionColumns("doris-1", "sales", "orders", undefined, "hive_catalog").map((column) => column.name)).toEqual(["external_id"]);
});
it("evicts old completion database entries", async () => {
const listDatabases = vi.fn(async (connectionId: string) => [{ name: `db_${connectionId}` }]);