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(completion): show derived table columns

Eve3d34f318e6b3
diff --git a/apps/desktop/src/components/editor/QueryEditor.vue b/apps/desktop/src/components/editor/QueryEditor.vue
index 002ae7cf44..8963e62ecb 100644
--- a/apps/desktop/src/components/editor/QueryEditor.vue
+++ b/apps/desktop/src/components/editor/QueryEditor.vue
@@ -4940,6 +4940,13 @@ function buildLocalSqlCompletionResult(completionContext: ReturnType<typeof getS
const cteDefs = extractCteDefinitions(fullDoc);
for (const refTable of completionContext.referencedTables) {
+ if (refTable.columns?.length) {
+ columnsByTable.set(
+ refTable.name,
+ refTable.columns.map((name) => ({ name, table: refTable.name, schema: refTable.schema })),
+ );
+ continue;
+ }
if (isVirtualCompletionTableReference(refTable)) continue;
const cteDef = cteDefs.find((c) => c.name.toLowerCase() === refTable.name.toLowerCase());
if (cteDef) {
diff --git a/apps/desktop/src/lib/__tests__/editor/queryEditorInlineColumnCompletion.spec.ts b/apps/desktop/src/lib/__tests__/editor/queryEditorInlineColumnCompletion.spec.ts
new file mode 100644
index 0000000000..4fed688bde
--- /dev/null
+++ b/apps/desktop/src/lib/__tests__/editor/queryEditorInlineColumnCompletion.spec.ts
@@ -0,0 +1,8 @@
+import { readFileSync } from "node:fs";
+import { expect, it } from "vitest";
+
+const queryEditorSource = readFileSync(new URL("../../../components/editor/QueryEditor.vue", import.meta.url), "utf8");
+
+it("maps inline projected columns into local completion results", () => {
+ expect(queryEditorSource).toMatch(/if \(refTable\.columns\?\.length\) \{[\s\S]*?columnsByTable\.set\([\s\S]*?refTable\.columns\.map/);
+});
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 2bec0f86df..29978b8a15 100644
--- a/apps/desktop/src/lib/__tests__/sql/semantic/completion.spec.ts
+++ b/apps/desktop/src/lib/__tests__/sql/semantic/completion.spec.ts
@@ -441,6 +441,26 @@ WHERE a.id = b.fk_kpi_set_score_id`,
expect(items.filter((item) => item.type === "column").map((item) => item.label)).toEqual(["id", "user_name"]);
});
+ it("keeps projected aliases from a multiline derived table", () => {
+ const { items } = semanticCompletion(
+ `SELECT
+ t.DEPTNO,
+ t.|
+FROM (
+ SELECT
+ DEPTNO,
+ AVG(SAL) avg_sal,
+ RANK() OVER (ORDER BY AVG(SAL) DESC) AS rnk
+ FROM emp
+ GROUP BY DEPTNO
+) AS t`,
+ {},
+ { databaseType: "mysql", dialect: "mysql" },
+ );
+
+ expect(items.filter((item) => item.type === "column").map((item) => item.label)).toEqual(["DEPTNO", "avg_sal", "rnk"]);
+ });
+
it("expands alias star from only the qualified row source", () => {
const columnsByTable = new Map<string, SqlCompletionColumn[]>([
["users", ["id", "name"].map((name) => ({ name, table: "users" }))],