xiaoxue_admin
/
dbx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(editor): complete Dameng columns without selected schema

This commit is contained in:
t8y2 2026-08-02 20:16:26 +08:00
parent 2aeafa136c
commit 22055e081f
No known key found for this signature in database
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
apps/desktop/src/stores/__tests__/connectionStore.completion.spec.ts vendored
View File

@ -72,6 +72,18 @@ function sqlServerConnection(): ConnectionConfig {
} as ConnectionConfig;
}
function damengConnection(): ConnectionConfig {
return {
...postgresConnection(),
id: "dameng-1",
name: "Dameng",
db_type: "dameng",
port: 5236,
username: "dbx_test",
database: "",
} as ConnectionConfig;
}
function dorisConnection(): ConnectionConfig {
return {
...postgresConnection(),
@ -295,6 +307,32 @@ describe("connectionStore completion assistant", () => {
expect(store.lookupLocalCompletionColumns("oracle-1", "ORCL", "ORDERS")).toEqual([]);
});
it("uses the Dameng login schema for unqualified column completion", async () => {
const completionAssistantSearch = vi.fn().mockRejectedValue(new Error("assistant unavailable"));
const getColumns = vi.fn().mockResolvedValue([{ name: "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 = [damengConnection()];
store.connectedIds.add("dameng-1");
const first = await store.listCompletionColumns("dameng-1", "", "tb_user");
const cached = await store.listCompletionColumns("dameng-1", "", "tb_user");
expect(completionAssistantSearch).toHaveBeenCalledTimes(1);
expect(getColumns).toHaveBeenCalledTimes(1);
expect(getColumns).toHaveBeenCalledWith("dameng-1", "", "dbx_test", "tb_user", undefined, undefined);
expect(first).toEqual([expect.objectContaining({ name: "ID", table: "tb_user", schema: "dbx_test" })]);
expect(cached).toEqual(first);
});
it("rejects assistant columns returned for a different MySQL parent table", async () => {
const completionAssistantSearch = vi.fn().mockResolvedValue({
candidates: [

2
apps/desktop/src/stores/connectionStore.ts
View File

@ -6077,7 +6077,7 @@ export const useConnectionStore = defineStore("connection", () => {
const oracleIdentifier = config?.db_type === "oracle";
const uppercaseUnquotedIdentifier = oracleIdentifier || config?.db_type === "saphana";
const completionTable = uppercaseUnquotedIdentifier && context?.tableQuoted === false ? table.toUpperCase() : table;
const rawCompletionSchema = schema?.trim() || undefined;
const rawCompletionSchema = schema?.trim() || (config?.db_type === "dameng" ? config.username?.trim() || undefined : undefined);
const completionSchema = uppercaseUnquotedIdentifier && rawCompletionSchema && context?.schemaQuoted === false ? rawCompletionSchema.toUpperCase() : rawCompletionSchema;
const usesOracleCurrentSchema = config?.db_type === "oracle" && !completionSchema;
if (isSchemaAwareDatabase(connectionId) && !connectionUsesDatabaseObjectTreeMode(config) && !completionSchema && !usesOracleCurrentSchema) {