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(editor): avoid table alias snippet replacing table name during completion (#13757)

lxk9558dc8e135e133
diff --git a/apps/desktop/src/lib/__tests__/sql/semantic/completion.spec.ts b/apps/desktop/src/lib/__tests__/sql/semantic/completion.spec.ts
index 4c15add73c..1c7c779093 100644
--- a/apps/desktop/src/lib/__tests__/sql/semantic/completion.spec.ts
+++ b/apps/desktop/src/lib/__tests__/sql/semantic/completion.spec.ts
@@ -36,6 +36,46 @@ function semanticCompletion(markedSql: string, input: Partial<SqlCompletionProvi
}
describe("semantic SQL completion candidates", () => {
+ it("does not suggest alias snippets when completing a table name (#13750)", () => {
+ const markedSql = `SELECT *
+FROM dbo.Dh_Workcenter b
+INNER JOIN dbo.Dh_WorkcenterProcess c ON c.Workcenter_ID = b.Workcenter_ID
+INNER JOIN dbo.DH_MODEL_CAP_SUB dmcs ON c.Process_ID = dmcs.Process_ID
+INNER JOIN dbo.Dh_Process a ON c.Process_ID = a.Process_ID AND a.Process_Type = '02'
+LEFT JOIN dbo.Db_ModelSetTemplat|
+WHERE b.Workcenter_ID = :workcenter_ID`;
+ const { items } = semanticCompletion(
+ markedSql,
+ {
+ tables: [{ name: "Db_ModelSetTemplate", schema: "dbo", type: "table" }],
+ autoAliasTables: true,
+ },
+ { databaseType: "sqlserver", dialect: "sqlserver" },
+ );
+
+ expect(items.some((item) => item.type === "snippet" && item.detail?.includes("alias for"))).toBe(false);
+ expect(items.some((item) => item.label.includes("dmst") && item.type === "snippet")).toBe(false);
+ expect(items.some((item) => item.type === "table" && item.label === "Db_ModelSetTemplate")).toBe(true);
+
+ // When the cursor is after the table name and a space, alias snippets should be offered
+ const afterTableSpaceSql = `SELECT *
+FROM dbo.Dh_Workcenter b
+LEFT JOIN dbo.Db_ModelSetTemplate |
+WHERE b.Workcenter_ID = :workcenter_ID`;
+ const afterTable = semanticCompletion(
+ afterTableSpaceSql,
+ {
+ tables: [{ name: "Db_ModelSetTemplate", schema: "dbo", type: "table" }],
+ autoAliasTables: false,
+ },
+ { databaseType: "sqlserver", dialect: "sqlserver" },
+ );
+
+ const aliasSnippet = afterTable.items.find((item) => item.type === "snippet" && item.detail?.includes("alias for Db_ModelSetTemplate"));
+ expect(aliasSnippet).toBeDefined();
+ expect(aliasSnippet?.apply).toBe("dmst ");
+ });
+
it("does not mix SELECT aliases into a following UPDATE statement", () => {
const columnsByTable = new Map<string, SqlCompletionColumn[]>([
["codex_completion_a", [{ name: "id", table: "codex_completion_a", schema: "public" }]],
diff --git a/apps/desktop/src/lib/__tests__/sql/sqlCompletion.context.spec.ts b/apps/desktop/src/lib/__tests__/sql/sqlCompletion.context.spec.ts
index eecb2be81b..acab0b22f4 100644
--- a/apps/desktop/src/lib/__tests__/sql/sqlCompletion.context.spec.ts
+++ b/apps/desktop/src/lib/__tests__/sql/sqlCompletion.context.spec.ts
@@ -2101,9 +2101,9 @@ describe("sqlCompletion scoped context classification", () => {
// The CTE is what the statement selects from, so it outranks a catalog table
// that only matched by initials.
expect(cteIndex).toBeLessThan(items.findIndex((item) => item.label === "tb_market_price"));
- // The alias snippet for the relation being typed stays available, matching
- // the document's existing alias-completion behaviour.
- expect(items.some((item) => item.type === "snippet" && item.apply === "tm ")).toBe(true);
+ // The alias snippet for the relation being typed must not be offered,
+ // avoiding replacing the table name being completed (#13750).
+ expect(items.some((item) => item.type === "snippet" && item.apply === "tm ")).toBe(false);
});
it("offers a star-projection CTE as a table candidate without a duplicate alias snippet", () => {
diff --git a/apps/desktop/src/lib/sql/semantic/completion.ts b/apps/desktop/src/lib/sql/semantic/completion.ts
index 24846a5542..67b12780af 100644
--- a/apps/desktop/src/lib/sql/semantic/completion.ts
+++ b/apps/desktop/src/lib/sql/semantic/completion.ts
@@ -1,4 +1,4 @@
-import type { SqlCompletionColumn, SqlCompletionContext, SqlCompletionReferencedTable } from "@/lib/sql/sqlCompletion";
+import { removeActiveTableCompletionReference, type SqlCompletionColumn, type SqlCompletionContext, type SqlCompletionReferencedTable } from "@/lib/sql/sqlCompletion";
import { SQL_SEMANTIC_DIALECTS } from "@/lib/sql/semantic/dialect";
import type { SqlSemanticModel, SqlSemanticRowSource, SqlSemanticSpan, SqlSemanticToken } from "@/lib/sql/semantic/types";
@@ -352,11 +352,15 @@ export function sqlCompletionContextFromSemantic(model: SqlSemanticModel, base:
const prefix = useBaseTrailingIdentifier ? base.prefix : model.cursorIntent.prefix;
const qualifierParts = model.cursorIntent.qualifierParts.length > 0 ? [...model.cursorIntent.qualifierParts] : useBaseTrailingIdentifier ? base.qualifierParts : undefined;
const qualifier = qualifierParts?.join(".");
- const referencedTables = sqlSemanticReferencedTables(model);
+ let referencedTables = sqlSemanticReferencedTables(model);
+ const suggestTables = scope.kind === "table" || scope.kind === "schema" || scope.kind === "catalog";
+ const activePrefixIsCte = model.rowSources.some((source) => source.kind === "cte" && source.name.toLowerCase() === prefix.toLowerCase());
+ if (suggestTables && prefix && referencedTables.length > 1 && !activePrefixIsCte) {
+ referencedTables = removeActiveTableCompletionReference(referencedTables, prefix, qualifier);
+ }
const mutationTarget = semanticMutationTarget(model);
const mutationDatabase = mutationTarget?.metadataTarget?.database;
const mutationSchema = mutationTarget?.qualifierParts[mutationTarget.qualifierParts.length - 1];
- const suggestTables = scope.kind === "table" || scope.kind === "schema" || scope.kind === "catalog";
const suggestColumns = scope.kind === "columns";
const suggestRoutines = scope.kind === "routine" || (suggestColumns && base.suggestRoutines && !base.exclusiveColumnSuggestions);
const projectionAliases = sqlSemanticProjectionAliasColumns(model).map((column) => column.name);
diff --git a/apps/desktop/src/lib/sql/sqlCompletion.ts b/apps/desktop/src/lib/sql/sqlCompletion.ts
index 1e20e80a01..fb26dcfed7 100644
--- a/apps/desktop/src/lib/sql/sqlCompletion.ts
+++ b/apps/desktop/src/lib/sql/sqlCompletion.ts
@@ -2104,7 +2104,7 @@ class SqlCompletionProvider {
}
const emptyTableNameCompletion = !context.prefix && (context.suggestTables || context.exclusiveTableSuggestions);
- if (!pendingJoinKeyword && !emptyTableNameCompletion && !context.tableAliasAfterCursor && context.referencedTables.length > 0 && !context.suggestColumns && !context.insertTable && supportsTableAliases(this.databaseType)) {
+ if (!pendingJoinKeyword && !emptyTableNameCompletion && !context.qualifier && !context.tableAliasAfterCursor && context.referencedTables.length > 0 && !context.suggestColumns && !context.insertTable && supportsTableAliases(this.databaseType)) {
this.items.push(...buildAliasItems(context));
}
@@ -3263,7 +3263,7 @@ function isColumnDataTypeContext(beforeToken: string, databaseType: DatabaseType
return isCreateTableColumnTypeContext(beforeToken, databaseType) || isAlterTableColumnTypeContext(beforeToken, databaseType);
}
-function removeActiveTableCompletionReference(referencedTables: SqlCompletionReferencedTable[], prefix: string, qualifier?: string): SqlCompletionReferencedTable[] {
+export function removeActiveTableCompletionReference(referencedTables: SqlCompletionReferencedTable[], prefix: string, qualifier?: string): SqlCompletionReferencedTable[] {
const activeName = normalizeIdentifierPart(prefix);
const activeQualifier = qualifier ? normalizeIdentifierPart(qualifier) : undefined;
return referencedTables.filter((table) => {
@@ -5692,6 +5692,8 @@ function buildReferencedAliasItems(context: SqlCompletionContext, t?: SqlComplet
}
function buildAliasItems(context: SqlCompletionContext): SqlCompletionItem[] {
+ if (context.qualifier) return [];
+ const inTableCompletion = context.suggestTables || context.exclusiveTableSuggestions;
const items: SqlCompletionItem[] = [];
const existingAliases = new Set(context.referencedTables.map((ref) => ref.alias?.toLowerCase()).filter((alias): alias is string => !!alias));
const seen = new Set<string>(existingAliases);
@@ -5700,6 +5702,9 @@ function buildAliasItems(context: SqlCompletionContext): SqlCompletionItem[] {
if (context.prefix && !matchesPrefix(ref.name, context.prefix)) continue;
const candidate = generateAlias(ref.name, seen);
if (!candidate || seen.has(candidate.toLowerCase())) continue;
+ // When the user is typing a table name, never suggest an alias snippet that would
+ // replace the table name with an acronym (#13750).
+ if (inTableCompletion && candidate.toLowerCase() !== context.prefix.toLowerCase()) continue;
// A relation that is also offered as a table candidate must not duplicate
// itself as a self-named alias snippet (CTEs and short table names);
// half-typed relations without columns keep theirs.