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(mysql): accept delimiter reset without whitespace
OOMEcho475f618d4bcd
diff --git a/apps/desktop/src/lib/__tests__/sql/sqlStatementRanges.spec.ts b/apps/desktop/src/lib/__tests__/sql/sqlStatementRanges.spec.tsindex 22a511e670..37ddcf48f6 100644--- a/apps/desktop/src/lib/__tests__/sql/sqlStatementRanges.spec.ts+++ b/apps/desktop/src/lib/__tests__/sql/sqlStatementRanges.spec.ts@@ -607,6 +607,11 @@ describe("splitSqlStatementRanges", () => {expect(rangeSqlTexts(splitSqlStatementRanges(sql, "mysql"))).toEqual(["select COUNT(1) FROM your_table", "select COUNT(1) FROM your_table;"]);});+ it("accepts a MySQL delimiter reset without whitespace", () => {+ const sql = "DELIMITER //\nCREATE PROCEDURE p() BEGIN SELECT 1; END //\nDELIMITER;\nCALL p();";+ expect(rangeSqlTexts(splitSqlStatementRanges(sql, "mysql"))).toEqual(["CREATE PROCEDURE p() BEGIN SELECT 1; END", "CALL p()"]);+ });+it("keeps MySQL routine blocks together without delimiter commands", () => {const ranges = splitSqlStatementRanges(mysqlRoutineFixture, "mysql");expect(rangeSqlTexts(ranges)).toEqual([mysqlRoutineFixture.slice(0, mysqlRoutineFixture.indexOf("\nSELECT 2;")).replace(/;$/, "").trim(), "SELECT 2"]);diff --git a/apps/desktop/src/lib/sql/sqlStatementRanges.ts b/apps/desktop/src/lib/sql/sqlStatementRanges.tsindex 0ff29906ab..579f615b7f 100644--- a/apps/desktop/src/lib/sql/sqlStatementRanges.ts+++ b/apps/desktop/src/lib/sql/sqlStatementRanges.ts@@ -2470,11 +2470,13 @@ function isSqlServerGoLine(sql: string, pos: number): boolean {function startsDelimiterCommand(sql: string, pos: number): boolean {const prefix = sql.slice(pos, pos + 9);- return prefix.toLowerCase() === "delimiter" && (sql[pos + 9] === " " || sql[pos + 9] === "\t");+ return prefix.toLowerCase() === "delimiter" && (sql[pos + 9] === " " || sql[pos + 9] === "\t" || sql[pos + 9] === ";");}function parseDelimiterCommand(line: string): string | null {- const match = /^delimiter[ \t]+(.+)$/i.exec(line.trim());+ const trimmed = line.trim();+ if (/^delimiter;$/i.test(trimmed)) return ";";+ const match = /^delimiter[ \t]+(.+)$/i.exec(trimmed);const delimiter = match?.[1]?.trim();return delimiter ? delimiter : null;}diff --git a/crates/dbx-sql-core/src/sql.rs b/crates/dbx-sql-core/src/sql.rsindex be0c56d412..97d0f81eb0 100644--- a/crates/dbx-sql-core/src/sql.rs+++ b/crates/dbx-sql-core/src/sql.rs@@ -1630,6 +1630,10 @@ fn first_sql_tokens(sql: &str, limit: usize) -> Vec<String> {}fn parse_delimiter_command(line: &str) -> Option<&str> {+ let line = line.trim();+ if line.eq_ignore_ascii_case("delimiter;") {+ return Some(";");+ }let bytes = line.as_bytes();let rest = if bytes.len() > 10&& (bytes[..10].eq_ignore_ascii_case(b"delimiter ") || bytes[..10].eq_ignore_ascii_case(b"delimiter\t"))@@ -3692,6 +3696,12 @@ SELECT 3;";assert_eq!(super::split_sql_statements(sql), vec!["CREATE PROCEDURE foo() BEGIN SELECT 1; END"]);}+ #[test]+ fn delimiter_reset_without_whitespace() {+ let sql = "DELIMITER //\nCREATE PROCEDURE foo() BEGIN SELECT 1; END//\nDELIMITER;\nCALL foo();";+ assert_eq!(super::split_sql_statements(sql), vec!["CREATE PROCEDURE foo() BEGIN SELECT 1; END", "CALL foo()"]);+ }+#[test]fn delimiter_case_insensitive() {let sql = "delimiter //\nSELECT 1//\ndelimiter ;\nSELECT 2;";