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。

feat(completion): add Spanner keywords and functions

dienasod6fec5a9503c
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 df7c46e4e4..2d3581d0ed 100644
--- a/apps/desktop/src/lib/__tests__/sql/sqlCompletion.context.spec.ts
+++ b/apps/desktop/src/lib/__tests__/sql/sqlCompletion.context.spec.ts
@@ -2799,3 +2799,58 @@ describe("quoted identifier completion filtering (issue #12008)", () => {
expect(quotedCompletionFilterPrefix(query, prefix)).toBeUndefined();
});
});
+
+describe("Spanner keyword completion (issue #13129)", () => {
+ it.each([
+ "CREATE CHANGE STREAM",
+ "CREATE SEARCH INDEX",
+ "CREATE VECTOR INDEX",
+ "CREATE PROPERTY GRAPH",
+ "INTERLEAVE IN PARENT",
+ "STORING",
+ "PENDING_COMMIT_TIMESTAMP",
+ "GENERATE_UUID",
+ // Ported from the overlapping #13138 (row-deletion policies, DML exits,
+ // scalar types, sequence options) so one list carries the full dialect.
+ "ROW DELETION POLICY",
+ "THEN RETURN",
+ "INSERT OR UPDATE",
+ "SQL SECURITY INVOKER",
+ "BIT_REVERSED_POSITIVE",
+ "INT64",
+ ])("offers %s", (label) => {
+ const sql = "CREATE ";
+ const items = buildSqlCompletionItems(sql, sql.length, {
+ databaseType: "spanner",
+ tables: [],
+ columnsByTable: new Map(),
+ });
+
+ expect(items.some((item) => item.label === label)).toBe(true);
+ });
+
+ it("keeps BigQuery-only syntax out of the Spanner keyword list", () => {
+ const sql = "SELECT * ";
+ const items = buildSqlCompletionItems(sql, sql.length, {
+ databaseType: "spanner",
+ tables: [],
+ columnsByTable: new Map(),
+ });
+
+ // TABLESAMPLE and FOR SYSTEM_TIME AS OF are BigQuery syntax; Spanner reads
+ // staleness through the API, not SQL.
+ expect(items.some((item) => item.label === "TABLESAMPLE")).toBe(false);
+ expect(items.some((item) => item.label === "FOR SYSTEM_TIME AS OF")).toBe(false);
+ });
+
+ it("keeps Spanner-only DDL out of the PostgreSQL keyword list", () => {
+ const sql = "CREATE ";
+ const items = buildSqlCompletionItems(sql, sql.length, {
+ databaseType: "postgres",
+ tables: [],
+ columnsByTable: new Map(),
+ });
+
+ expect(items.some((item) => item.label === "CREATE CHANGE STREAM")).toBe(false);
+ });
+});
diff --git a/apps/desktop/src/lib/sql/sqlCompletion.ts b/apps/desktop/src/lib/sql/sqlCompletion.ts
index bb7e6c9c72..8dcca71c4d 100644
--- a/apps/desktop/src/lib/sql/sqlCompletion.ts
+++ b/apps/desktop/src/lib/sql/sqlCompletion.ts
@@ -501,6 +501,97 @@ const MANTICORESEARCH_SQL_KEYWORDS = ["FACET", "MATCH", "SHOW", "SHOW META", "SH
// CUBE grouping modifiers plus DDL vocabulary. Keep them scoped to ClickHouse.
const CLICKHOUSE_SQL_KEYWORDS = ["FINAL", "PREWHERE", "SAMPLE", "TOTALS", "ROLLUP", "CUBE", "GLOBAL", "ARRAY", "ENGINE", "PARTITION", "TTL", "CODEC", "SETTINGS", "FORMAT", "OUTFILE", "ATTACH", "DETACH", "OPTIMIZE", "SYSTEM", "KILL", "MATERIALIZED", "PROJECTION", "GRANULARITY"];
+// Cloud Spanner (GoogleSQL) DDL and functions that are not part of the common
+// keyword set: change streams, search/vector indexes, property graphs, proto
+// bundles, interleaved tables and the Spanner-specific functions.
+const SPANNER_SQL_KEYWORDS = [
+ "CREATE CHANGE STREAM",
+ "ALTER CHANGE STREAM",
+ "DROP CHANGE STREAM",
+ "CREATE SEARCH INDEX",
+ "DROP SEARCH INDEX",
+ "CREATE VECTOR INDEX",
+ "DROP VECTOR INDEX",
+ "CREATE PROPERTY GRAPH",
+ "DROP PROPERTY GRAPH",
+ "CREATE SEQUENCE",
+ "ALTER SEQUENCE",
+ "DROP SEQUENCE",
+ "CREATE MODEL",
+ "ALTER MODEL",
+ "DROP MODEL",
+ "CREATE PROTO BUNDLE",
+ "ALTER PROTO BUNDLE",
+ "DROP PROTO BUNDLE",
+ "CREATE SCHEMA",
+ "DROP SCHEMA",
+ "ALTER DATABASE",
+ "INTERLEAVE IN PARENT",
+ "INTERLEAVE IN",
+ "ON DELETE CASCADE",
+ "ON DELETE NO ACTION",
+ "ROW DELETION POLICY",
+ "ADD ROW DELETION POLICY",
+ "DROP ROW DELETION POLICY",
+ "REPLACE ROW DELETION POLICY",
+ "OLDER_THAN",
+ "STORING",
+ "NULL_FILTERED",
+ "TOKENLIST",
+ "CHANGE STREAM",
+ "SEARCH INDEX",
+ "VECTOR INDEX",
+ "PROPERTY GRAPH",
+ "GRAPH_TABLE",
+ "NODE TABLES",
+ "EDGE TABLES",
+ "SOURCE KEY",
+ "DESTINATION KEY",
+ "FOR ALL",
+ "SET OPTIONS",
+ "SQL SECURITY INVOKER",
+ "THEN RETURN",
+ "INSERT OR UPDATE",
+ "INSERT OR IGNORE",
+ "PROTO BUNDLE",
+ "SEQUENCE",
+ "MODEL",
+ "WITH OFFSET",
+ "UNNEST",
+ "QUALIFY",
+ "PIVOT",
+ "UNPIVOT",
+ "SAFE_CAST",
+ "SELECT AS STRUCT",
+ "SELECT AS VALUE",
+ "EXCEPT DISTINCT",
+ "INTERSECT DISTINCT",
+ "GENERATE_UUID",
+ "GET_NEXT_SEQUENCE_VALUE",
+ "PENDING_COMMIT_TIMESTAMP",
+ "COMMIT_TIMESTAMP",
+ "JSON_QUERY",
+ "JSON_VALUE",
+ "JSON_QUERY_ARRAY",
+ "JSON_VALUE_ARRAY",
+ "PARSE_JSON",
+ "TO_JSON",
+ "TO_JSON_STRING",
+ "ARRAY",
+ "STRUCT",
+ "INT64",
+ "FLOAT32",
+ "FLOAT64",
+ "BIGNUMERIC",
+ "STRING",
+ "BYTES",
+ "BOOL",
+ "PROTO",
+ "BIT_REVERSED_POSITIVE",
+ "SKIP RANGE",
+ "START COUNTER WITH",
+];
+
const SQLITE_SQL_KEYWORDS = ["AUTOINCREMENT", "INTEGER", "BLOB", "BOOLEAN", "WITHOUT ROWID", "VACUUM", "PRAGMA", "JSON_EXTRACT", "JSON_SET", "STRFTIME"];
// DuckDB extends the common SQL grammar with analytical clauses, relation
@@ -755,6 +846,7 @@ const DATABASE_SQL_KEYWORDS: Partial<Record<DatabaseType, string[]>> = {
turso: SQLITE_SQL_KEYWORDS,
"cloudflare-d1": SQLITE_SQL_KEYWORDS,
sqlserver: SQLSERVER_SQL_KEYWORDS,
+ spanner: SPANNER_SQL_KEYWORDS,
oracle: ORACLE_SQL_KEYWORDS,
"oceanbase-oracle": ORACLE_SQL_KEYWORDS,
manticoresearch: MANTICORESEARCH_SQL_KEYWORDS,