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(postgres): preserve completion for keyword-like identifiers (#13751)

lcq928151f30053b19
diff --git a/apps/desktop/src/lib/__tests__/sql/sqlCompletion.postgresIdentifiers.spec.ts b/apps/desktop/src/lib/__tests__/sql/sqlCompletion.postgresIdentifiers.spec.ts
new file mode 100644
index 0000000000..d03653eaf2
--- /dev/null
+++ b/apps/desktop/src/lib/__tests__/sql/sqlCompletion.postgresIdentifiers.spec.ts
@@ -0,0 +1,113 @@
+import { describe, expect, it } from "vitest";
+import { buildSqlCompletionItemsFromContext, getSqlCompletionContext, type SqlCompletionColumn } from "@/lib/sql/sqlCompletion";
+import { SqlCompletionAnalysisEngine } from "@/lib/sql/sqlCompletionAnalysis";
+
+// Each name accepts both CREATE TABLE name (...) and CREATE TABLE t (name integer)
+// followed by an unquoted SELECT in PostgreSQL 16.10 (#13742).
+const postgresIdentifierNames = [
+ "alter",
+ "anti",
+ "apply",
+ "asof",
+ "between",
+ "coalesce",
+ "current",
+ "database",
+ "delete",
+ "describe",
+ "drop",
+ "exists",
+ "explain",
+ "filter",
+ "first",
+ "following",
+ "ignore",
+ "index",
+ "insert",
+ "key",
+ "last",
+ "next",
+ "nulls",
+ "over",
+ "partition",
+ "pivot",
+ "positional",
+ "preceding",
+ "qualify",
+ "recursive",
+ "respect",
+ "rows",
+ "sample",
+ "schema",
+ "semi",
+ "set",
+ "straight_join",
+ "unbounded",
+ "unpivot",
+ "update",
+ "values",
+ "view",
+];
+const dialectOptions = { databaseType: "postgres", dialect: "postgres" } as const;
+
+describe.each([false, true])("PostgreSQL keyword-like identifiers (semantic=%s)", (semanticCompletionEnabled) => {
+ it.each(postgresIdentifierNames)("completes columns of the unquoted table %s", (table) => {
+ const columns = ["request_no", "org_id"].map((name) => ({ name, table, schema: "public" }));
+ const engine = new SqlCompletionAnalysisEngine();
+ for (const prefix of ["req", "or", "org", "request_no", "org_id"]) {
+ const sql = `SELECT *\nFROM ${table} WHERE ${prefix};`;
+ const { completionContext } = engine.analyze({ ...dialectOptions, sql, cursor: sql.length - 1, semanticCompletionEnabled });
+ const items = buildSqlCompletionItemsFromContext(completionContext, {
+ ...dialectOptions,
+ tables: [{ name: table, schema: "public" }],
+ columnsByTable: new Map([[`public.${table}`, columns]]),
+ });
+ expect(completionContext.referencedTables, sql).toEqual(expect.arrayContaining([expect.objectContaining({ name: table })]));
+ expect(
+ items.filter((item) => item.type === "column").map((item) => item.label),
+ sql,
+ ).toContain(prefix.startsWith("or") ? "org_id" : "request_no");
+ }
+ });
+
+ it.each(postgresIdentifierNames)("completes the keyword-like column %s", (name) => {
+ const columns: SqlCompletionColumn[] = [{ name, table: "records", schema: "public" }];
+ const engine = new SqlCompletionAnalysisEngine();
+ for (const clause of ["SELECT", "SELECT * FROM records WHERE"]) {
+ for (const prefix of [name.slice(0, 2), name]) {
+ const sql = clause === "SELECT" ? `SELECT ${prefix} FROM records;` : `${clause} ${prefix};`;
+ const cursor = clause === "SELECT" ? `SELECT ${prefix}`.length : sql.length - 1;
+ const { completionContext } = engine.analyze({ ...dialectOptions, sql, cursor, semanticCompletionEnabled });
+ const items = buildSqlCompletionItemsFromContext(completionContext, {
+ ...dialectOptions,
+ tables: [{ name: "records", schema: "public" }],
+ columnsByTable: new Map([["public.records", columns]]),
+ });
+ expect(items, sql).toEqual(expect.arrayContaining([expect.objectContaining({ label: name, type: "column" })]));
+ }
+ }
+ });
+});
+
+describe("keyword-like table reference boundaries", () => {
+ it.each(["FROM", "WHERE", "JOIN", "ON", "GROUP", "ORDER", "LIMIT"])("does not treat a PostgreSQL clause word as a table: %s", (word) => {
+ const sql = `SELECT * FROM ${word} req`;
+ expect(getSqlCompletionContext(sql, sql.length, dialectOptions).referencedTables.map((table) => table.name)).not.toContain(word.toLowerCase());
+ });
+
+ it.each(["redshift", "gaussdb", "kingbase", "highgo", "uxdb", "vastbase", "kwdb", "opengauss"] as const)("preserves PostgreSQL-like identifier rules for %s", (databaseType) => {
+ const sql = "SELECT * FROM apply WHERE req";
+ expect(getSqlCompletionContext(sql, sql.length, { databaseType }).referencedTables).toEqual([expect.objectContaining({ name: "apply" })]);
+ });
+
+ it.each(["CROSS", "OUTER"])("preserves SQL Server %s APPLY table references", (modifier) => {
+ const sql = `SELECT * FROM users u ${modifier} APPLY orders o WHERE o.req`;
+ const context = getSqlCompletionContext(sql, sql.length, { databaseType: "sqlserver", dialect: "sqlserver" });
+ expect(context.referencedTables).toEqual([expect.objectContaining({ name: "users", alias: "u" }), expect.objectContaining({ name: "orders", alias: "o" })]);
+ });
+
+ it("does not relax the legacy blacklist for SQL Server", () => {
+ const sql = "SELECT * FROM apply WHERE req";
+ expect(getSqlCompletionContext(sql, sql.length, { databaseType: "sqlserver" }).referencedTables).toEqual([]);
+ });
+});
diff --git a/apps/desktop/src/lib/sql/sqlCompletion.ts b/apps/desktop/src/lib/sql/sqlCompletion.ts
index fb26dcfed7..1fbe755cb5 100644
--- a/apps/desktop/src/lib/sql/sqlCompletion.ts
+++ b/apps/desktop/src/lib/sql/sqlCompletion.ts
@@ -4141,6 +4141,7 @@ function extractReferencedTables(sql: string, databaseType?: DatabaseType): SqlC
// FROM/JOIN table reference; double-quoted table names survive masking (see
// maskSqlLiteralsAndComments), so the returned table info built from `match` is unaffected.
const scanSql = maskSqlLiteralsAndComments(sql, databaseType);
+ const postgresIdentifiers = !!databaseType && POSTGRES_LIKE_IDENTIFIER_DATABASES.has(databaseType);
const referenced: SqlCompletionReferencedTable[] = [];
let match: RegExpExecArray | null;
while ((match = pattern.exec(scanSql)) !== null) {
@@ -4150,7 +4151,12 @@ function extractReferencedTables(sql: string, databaseType?: DatabaseType): SqlC
pattern.lastIndex = match.index + match[0].length - alias.length;
}
const quotedName = !!rawName && (rawName.startsWith('"') || rawName.startsWith("`") || rawName.startsWith("["));
- if (!quotedName && rawName && ALIAS_BLACKLIST.has(rawName.toLowerCase())) continue;
+ // Alias/clause words can still be legal unquoted PostgreSQL table names (#13742).
+ if (!quotedName && rawName && ALIAS_BLACKLIST.has(rawName.toLowerCase()) && (!postgresIdentifiers || requiresPostgresIdentifierQuote(rawName.toLowerCase()))) {
+ // A keyword-like projection (SELECT apply FROM ...) must not consume the real FROM.
+ pattern.lastIndex = match.index + match[0].search(/\s/) + 1;
+ continue;
+ }
// Filter out SQL keywords that accidentally matched as aliases
const cleanAlias = alias && !ALIAS_BLACKLIST.has(alias.toLowerCase()) ? alias : undefined;
if (isElasticsearchStyleIndexName(rawName)) {
diff --git a/docs/assets/issue-13742/postgres-completion.png b/docs/assets/issue-13742/postgres-completion.png
new file mode 100644
index 0000000000..f43de62abc
Binary files /dev/null and b/docs/assets/issue-13742/postgres-completion.png differ