feat(editor): improve qualified table completion

This commit is contained in:
t8y2 committed 2026-07-07 18:57:46 +08:00
1 parent 3d935f7eb6
commit 42eaddac45
3 files changed
+155 -21

No files matched your search

@@ -0,0 +1,78 @@
import { describe, expect, it } from "vitest";
import { resolveSqlCompletionTableLookupTarget } from "@/lib/sql/sqlCompletionLookupTarget";
describe("sqlCompletionLookupTarget", () => {
it("treats qualified table completion as a database lookup for MySQL-compatible engines", () => {
const target = resolveSqlCompletionTableLookupTarget({
currentDatabase: "default_db",
supportsDatabaseQualifier: true,
completionContext: {
qualifier: "game_data",
prefix: "",
suggestTables: true,
},
});
expect(target).toEqual({
database: "game_data",
filter: "",
qualifierDatabase: "game_data",
});
});
it("preserves the known database casing when the qualifier matches locally", () => {
const target = resolveSqlCompletionTableLookupTarget({
currentDatabase: "default_db",
supportsDatabaseQualifier: true,
knownDatabases: ["Game_Data"],
completionContext: {
qualifier: "game_data",
prefix: "ord",
suggestTables: true,
},
});
expect(target).toEqual({
database: "Game_Data",
filter: "ord",
qualifierDatabase: "Game_Data",
});
});
it("keeps schema-aware qualified table completion scoped to the schema", () => {
const target = resolveSqlCompletionTableLookupTarget({
currentDatabase: "app",
currentSchema: "public",
supportsDatabaseQualifier: false,
completionContext: {
qualifier: "sales",
prefix: "ord",
suggestTables: true,
},
});
expect(target).toEqual({
database: "app",
schema: "sales",
filter: "ord",
});
});
it("uses the current schema for unqualified table completion", () => {
const target = resolveSqlCompletionTableLookupTarget({
currentDatabase: "app",
currentSchema: "public",
supportsDatabaseQualifier: true,
completionContext: {
prefix: "ord",
suggestTables: true,
},
});
expect(target).toEqual({
database: "app",
schema: "public",
filter: "ord",
});
});
});
@@ -0,0 +1,42 @@
import type { SqlCompletionContext } from "@/lib/sql/sqlCompletion";
export interface SqlCompletionTableLookupTarget {
database: string;
schema?: string;
filter: string;
qualifierDatabase?: string;
}
function findExactName(names: readonly string[] | undefined, value: string): string | undefined {
return names?.find((name) => name.toLowerCase() === value.toLowerCase());
}
export function resolveSqlCompletionTableLookupTarget(options: {
currentDatabase: string;
currentSchema?: string;
supportsDatabaseQualifier: boolean;
completionContext: Pick<SqlCompletionContext, "qualifier" | "prefix" | "suggestTables" | "insertTable">;
knownDatabases?: readonly string[];
}): SqlCompletionTableLookupTarget {
const { completionContext } = options;
const qualifier = completionContext.qualifier?.trim();
const qualifierIsDatabase = options.supportsDatabaseQualifier && !!qualifier && completionContext.suggestTables && !completionContext.insertTable;
if (qualifierIsDatabase) {
// MySQL-compatible engines, including OceanBase MySQL mode, use
// database.table. Do not block table completion on a separate database-list
// request when the user already typed the database qualifier.
const database = findExactName(options.knownDatabases, qualifier) ?? qualifier;
return {
database,
filter: completionContext.prefix,
qualifierDatabase: database,
};
}
return {
database: options.currentDatabase,
schema: qualifier && completionContext.suggestTables ? qualifier : options.currentSchema,
filter: qualifier && completionContext.suggestTables ? completionContext.prefix : qualifier || completionContext.prefix,
};
}