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(sql): add timestamptz and postgresql data types to sql completion

lxk9553ebaf047e09e
diff --git a/apps/desktop/src/lib/__tests__/sql/sqlCompletion.postgresKeywords.spec.ts b/apps/desktop/src/lib/__tests__/sql/sqlCompletion.postgresKeywords.spec.ts
new file mode 100644
index 0000000000..2607168efd
--- /dev/null
+++ b/apps/desktop/src/lib/__tests__/sql/sqlCompletion.postgresKeywords.spec.ts
@@ -0,0 +1,68 @@
+import { describe, expect, it } from "vitest";
+import { buildSqlCompletionItems } from "@/lib/sql/sqlCompletion";
+
+describe("PostgreSQL keyword and data type completion (#12568)", () => {
+ function itemsFor(sql: string, databaseType = "postgres", keywordCase?: "upper" | "lower" | "pascal") {
+ return buildSqlCompletionItems(sql, sql.length, {
+ databaseType: databaseType as never,
+ tables: [],
+ columnsByTable: new Map(),
+ keywordCase,
+ });
+ }
+
+ function labelsFor(sql: string, databaseType = "postgres", keywordCase?: "upper" | "lower" | "pascal") {
+ return itemsFor(sql, databaseType, keywordCase).map((item) => item.label);
+ }
+
+ it("offers TIMESTAMPTZ and TIMESTAMP for the 'times' prefix in PostgreSQL", () => {
+ const labels = labelsFor("times");
+ expect(labels).toContain("TIMESTAMPTZ");
+ expect(labels).toContain("TIMESTAMP");
+ });
+
+ it("offers TIMESTAMPTZ with 'data type' detail when creating a table in PostgreSQL DDL", () => {
+ const sql = "CREATE TABLE audit_log (id BIGSERIAL PRIMARY KEY, created_at times";
+ const items = itemsFor(sql);
+ const timestamptzItem = items.find((item) => item.label === "TIMESTAMPTZ");
+
+ expect(timestamptzItem).toBeDefined();
+ expect(timestamptzItem?.detail).toBe("data type");
+ expect(timestamptzItem?.type).toBe("keyword");
+ });
+
+ it("offers TIMETZ and INTERVAL in DDL column definitions", () => {
+ const timetzLabels = labelsFor("CREATE TABLE events (event_time timet");
+ expect(timetzLabels).toContain("TIMETZ");
+
+ const intervalLabels = labelsFor("CREATE TABLE events (duration inter");
+ expect(intervalLabels).toContain("INTERVAL");
+ });
+
+ it("offers INT8, INT4, and INT2 as data types in PostgreSQL DDL", () => {
+ const items = itemsFor("CREATE TABLE t (col int");
+ const int8Item = items.find((item) => item.label === "INT8");
+ const int4Item = items.find((item) => item.label === "INT4");
+ const int2Item = items.find((item) => item.label === "INT2");
+
+ expect(int8Item?.detail).toBe("data type");
+ expect(int4Item?.detail).toBe("data type");
+ expect(int2Item?.detail).toBe("data type");
+ });
+
+ it("respects lowercase keyword formatting for PostgreSQL completions", () => {
+ const labels = labelsFor("times", "postgres", "lower");
+ expect(labels).toContain("timestamptz");
+ expect(labels).toContain("timestamp");
+ });
+
+ it.each(["kingbase", "vastbase", "gaussdb", "opengauss", "redshift"])("offers TIMESTAMPTZ for %s dialect", (dialect) => {
+ const labels = labelsFor("times", dialect);
+ expect(labels).toContain("TIMESTAMPTZ");
+ });
+
+ it("offers TIMESTAMPTZ for DuckDB", () => {
+ const labels = labelsFor("times", "duckdb");
+ expect(labels).toContain("TIMESTAMPTZ");
+ });
+});
diff --git a/apps/desktop/src/lib/sql/sqlCompletion.ts b/apps/desktop/src/lib/sql/sqlCompletion.ts
index ba3844a45d..2afe1642a4 100644
--- a/apps/desktop/src/lib/sql/sqlCompletion.ts
+++ b/apps/desktop/src/lib/sql/sqlCompletion.ts
@@ -220,6 +220,9 @@ const SQL_KEYWORDS = [
"TEXT",
"TIME",
"TIMESTAMP",
+ "TIMESTAMPTZ",
+ "TIMETZ",
+ "INTERVAL",
"TINYINT",
"UNIQUEIDENTIFIER",
"VARBINARY",
@@ -420,6 +423,17 @@ const POSTGRES_SQL_KEYWORDS = [
"TSQUERY",
"BYTEA",
"BOOLEAN",
+ "TIMESTAMPTZ",
+ "TIMETZ",
+ "INTERVAL",
+ "INT2",
+ "INT4",
+ "INT8",
+ "FLOAT4",
+ "FLOAT8",
+ "MONEY",
+ "VARBIT",
+ "DOUBLE PRECISION",
"RETURNING",
"ILIKE",
"SIMILAR TO",
@@ -517,6 +531,8 @@ const DUCKDB_SQL_KEYWORDS = [
"UNPIVOT",
"USING SAMPLE",
"WINDOW",
+ "TIMESTAMPTZ",
+ "INTERVAL",
];
const SQLSERVER_SQL_KEYWORDS = [
@@ -718,6 +734,14 @@ const ORACLE_SQL_KEYWORDS = Array.from(
const DATABASE_SQL_KEYWORDS: Partial<Record<DatabaseType, string[]>> = {
mysql: MYSQL_SQL_KEYWORDS,
postgres: POSTGRES_SQL_KEYWORDS,
+ redshift: POSTGRES_SQL_KEYWORDS,
+ gaussdb: POSTGRES_SQL_KEYWORDS,
+ opengauss: POSTGRES_SQL_KEYWORDS,
+ kingbase: POSTGRES_SQL_KEYWORDS,
+ vastbase: POSTGRES_SQL_KEYWORDS,
+ highgo: POSTGRES_SQL_KEYWORDS,
+ uxdb: POSTGRES_SQL_KEYWORDS,
+ sundb: POSTGRES_SQL_KEYWORDS,
sqlite: SQLITE_SQL_KEYWORDS,
rqlite: SQLITE_SQL_KEYWORDS,
turso: SQLITE_SQL_KEYWORDS,
@@ -731,8 +755,6 @@ const DATABASE_SQL_KEYWORDS: Partial<Record<DatabaseType, string[]>> = {
doris: ["COMMENT", "MATERIALIZED", "MATERIALIZED VIEW", "DISTRIBUTED BY HASH", "DUPLICATE KEY", "AGGREGATE KEY", "UNIQUE KEY", "PRIMARY KEY", "PROPERTIES", "PARTITION BY", "BUCKETS", "LATERAL VIEW", "EXPLODE", "ARRAY", "MAP", "STRUCT", "BITMAP", "HLL"],
starrocks: ["COMMENT", "MATERIALIZED", "MATERIALIZED VIEW", "DISTRIBUTED BY HASH", "DUPLICATE KEY", "PROPERTIES", "PARTITION BY", "BUCKETS", "LATERAL VIEW"],
dameng: ["COMMENT"],
- kingbase: ["COMMENT"],
- vastbase: ["COMMENT"],
spark: ["COMMENT"],
iotdb: ["COMMENT"],
};
@@ -879,6 +901,16 @@ const DATA_TYPE_KEYWORDS = new Set([
"TEXT",
"TIME",
"TIMESTAMP",
+ "TIMESTAMPTZ",
+ "TIMETZ",
+ "INTERVAL",
+ "INT2",
+ "INT4",
+ "INT8",
+ "FLOAT4",
+ "FLOAT8",
+ "VARBIT",
+ "DOUBLE PRECISION",
"TINYINT",
"UNIQUEIDENTIFIER",
"VARBINARY",