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

fix(completion): avoid table fallback for aliases

This commit is contained in:
t8y2 2026-06-10 10:51:41 +08:00
parent dadcc348cb
commit 3a52d961fc
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/desktop/src/components/editor/QueryEditor.vue
View File

@ -1117,7 +1117,7 @@ async function performAsyncCompletionWithResult(epoch: number, completionContext
// If qualifier didn't match any table names, try it as a schema name
let qualifierIsSchema = false;
if (completionContext.qualifier && tables.length === 0 && (completionContext.suggestTables || completionContext.exclusiveColumnSuggestions)) {
if (completionContext.qualifier && !isReferencedTableQualifier(completionContext) && tables.length === 0 && (completionContext.suggestTables || completionContext.exclusiveColumnSuggestions)) {
const schemaTables = await connectionStore.listCompletionTables(props.connectionId!, props.database!, completionContext.prefix, MAX_COMPLETION_TABLES, completionContext.qualifier);
if (schemaTables.length > 0) {
tables = schemaTables;

40
packages/app-tests/sqlCompletion.test.ts
View File

@ -262,6 +262,46 @@ test("keeps explicit alias column suggestions scoped to the alias table", () =>
);
});
test("does not show table names after an explicit alias qualifier", () => {
const sql = "select * from billing_owner b where b.";
const items = buildSqlCompletionItems(sql, sql.length, {
tables: [
{ name: "base_gateway_expand", schema: "BU", type: "table" },
{ name: "billing_owner", schema: "BU", type: "table" },
],
columnsByTable: new Map(),
});
assert.deepEqual(items, []);
});
test("suggests columns after an explicit alias qualifier without leaking tables", () => {
const sql = "select * from billing_owner b where b.";
const items = buildSqlCompletionItems(sql, sql.length, {
tables: [
{ name: "base_gateway_expand", schema: "BU", type: "table" },
{ name: "billing_owner", schema: "BU", type: "table" },
],
columnsByTable: new Map([
[
"BU.billing_owner",
[
{ name: "owner_id", table: "billing_owner", schema: "BU", dataType: "number" },
{ name: "owner_name", table: "billing_owner", schema: "BU", dataType: "varchar" },
],
],
]),
});
assert.deepEqual(
items.map((item) => [item.label, item.type, item.detail]),
[
["owner_id", "column", "BU.billing_owner [number]"],
["owner_name", "column", "BU.billing_owner [varchar]"],
],
);
});
test("shows column comments in WHERE field completions", () => {
const sql = "select * from public.orders where st";
const items = buildSqlCompletionItems(sql, sql.length, {