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。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
fix(sql): keep semicolonless statements on separate lines
zipgd8943706c0b3
diff --git a/apps/desktop/src/lib/__tests__/sql/sqlLayout.spec.ts b/apps/desktop/src/lib/__tests__/sql/sqlLayout.spec.tsindex 37c6b3b581..8e67d4cda0 100644--- a/apps/desktop/src/lib/__tests__/sql/sqlLayout.spec.ts+++ b/apps/desktop/src/lib/__tests__/sql/sqlLayout.spec.ts@@ -19,6 +19,30 @@ async function format(sql: string, overrides: Partial<SqlFormatterSettings> = {}const lines = (...rows: string[]) => rows.join("\n");describe("sql layout", () => {+ it.each([+ ["SELECT 1\nSELECT 2", "SELECT 1\nSELECT 2"],+ ["SELECT a FROM t\nSELECT b FROM u", "SELECT a\nFROM t\nSELECT b\nFROM u"],+ ["SELECT 1\nUPDATE t SET a = 2", "SELECT 1\nUPDATE t\nSET a = 2"],+ ["UPDATE t SET a = 1\nUPDATE t SET a = 2", "UPDATE t\nSET a = 1\nUPDATE t\nSET a = 2"],+ ["SET @a = 1\nSELECT @a", "SET @a = 1\nSELECT @a"],+ ["DELETE FROM t\nINSERT INTO t VALUES (1)", "DELETE FROM t\nINSERT INTO t\nVALUES (1)"],+ ["SELECT 1\nSHOW TABLES", "SELECT 1\nSHOW TABLES"],+ ])("keeps unseparated statements on different lines (#12523): %s", async (sql, expected) => {+ const formatted = await format(sql);+ expect(formatted).toBe(expected);+ expect(await format(formatted)).toBe(formatted);+ expect(formatted).not.toContain(";");+ });++ it.each([+ ["SELECT (SELECT 1) AS value", "SELECT (SELECT 1) AS value"],+ ["WITH t AS (SELECT 1 AS a) SELECT a FROM t", "WITH t AS (SELECT 1 AS a) SELECT a FROM t"],+ ["SELECT 'SELECT UPDATE' AS value", "SELECT 'SELECT UPDATE' AS value"],+ ["UPDATE t SET a = 1 WHERE id = 2", "UPDATE t SET a = 1 WHERE id = 2"],+ ])("keeps a single short statement compact: %s", async (sql, expected) => {+ expect(await format(sql)).toBe(expected);+ });+it("formats a query with a derived table (#827)", async () => {const sql = lines("SELECT loc_id, loc_name, loc_type, delivery_emp_num, update_time",diff --git a/apps/desktop/src/lib/sql/layout/primitives.ts b/apps/desktop/src/lib/sql/layout/primitives.tsindex 7555df85e6..60fbb30f41 100644--- a/apps/desktop/src/lib/sql/layout/primitives.ts+++ b/apps/desktop/src/lib/sql/layout/primitives.ts@@ -411,6 +411,28 @@ export function clauseChildContext(ctx: SqlLayoutContext, clause: ClauseNode): Sreturn { ...ctx, nonCallParens: new Set([...(ctx.nonCallParens ?? []), clause.children[at]]) };}+// The parser groups everything up to a semicolon into one StatementNode,+// including scripts whose statements are separated only by newlines. Do not+// collapse several statement heads onto one line. Only inspect sibling clauses:+// SELECTs in CTEs, subqueries, strings and comments must not count here.+function hasMultipleStatementHeads(nodes: AstNode[]): boolean {+ let seenHead = false;+ let updateNeedsSet = false;+ for (const node of nodes) {+ if (node.type !== "clause") continue;+ const keyword = node.nameKw.text.toUpperCase();+ if (keyword === "SET" && updateNeedsSet) {+ updateNeedsSet = false;+ continue;+ }+ if (!/^(?:SELECT|INSERT|REPLACE|UPDATE|DELETE|MERGE|CREATE|ALTER|DROP|TRUNCATE|SHOW|DESCRIBE|DESC|EXPLAIN|USE|SET|CALL|EXEC|EXECUTE|GRANT|REVOKE|COMMIT|ROLLBACK)\b/.test(keyword)) continue;+ if (seenHead) return true;+ seenHead = true;+ updateNeedsSet = keyword === "UPDATE";+ }+ return false;+}+/*** Renders `nodes` on one line, or `null` when they do not fit in `width`.*@@ -429,7 +451,7 @@ export function clauseChildContext(ctx: SqlLayoutContext, clause: ClauseNode): S* while it fits; the printer splits the operators onto their own lines otherwise.*/export function renderInline(ctx: SqlLayoutContext, nodes: AstNode[], width: number): string | null {- if (nodes.length === 0 || width <= 0) return null;+ if (nodes.length === 0 || width <= 0 || hasMultipleStatementHeads(nodes)) return null;const parenAt = nodes.findIndex(isParenthesis);if (parenAt >= 0) {diff --git a/docs/assets/pr-12523/README.md b/docs/assets/pr-12523/README.mdnew file mode 100644index 0000000000..181c71e4d4--- /dev/null+++ b/docs/assets/pr-12523/README.md@@ -0,0 +1,5 @@+# #12523 修复实测++`sql-format-newlines.png` 展示本分支真实 `QueryEditor.vue` 组件的格式化结果。+在独立的本地 Vue 页面中选择 DBX 排版风格,输入两行无分号的 SELECT 后点击格式化;两条查询仍各占一行,没有插入分号。+此页面使用生产组件和格式化代码,未连接数据库,也未执行 SQL。diff --git a/docs/assets/pr-12523/sql-format-newlines.png b/docs/assets/pr-12523/sql-format-newlines.pngnew file mode 100644index 0000000000..1b35fa7f28Binary files /dev/null and b/docs/assets/pr-12523/sql-format-newlines.png differ