fix(mysql): accept delimiter reset without whitespace

This commit is contained in:
OOMEcho authored and GitHub committed 2026-09-29 12:34:26 +08:00
1 parent ba5c04c750
commit 475f618d4b
3 files changed
+19 -2

No files matched your search

@@ -607,6 +607,11 @@ describe("splitSqlStatementRanges", () => {
expect(rangeSqlTexts(splitSqlStatementRanges(sql, "mysql"))).toEqual(["select COUNT(1) FROM your_table", "select COUNT(1) FROM your_table;"]); 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", () => { it("keeps MySQL routine blocks together without delimiter commands", () => {
const ranges = splitSqlStatementRanges(mysqlRoutineFixture, "mysql"); const ranges = splitSqlStatementRanges(mysqlRoutineFixture, "mysql");
expect(rangeSqlTexts(ranges)).toEqual([mysqlRoutineFixture.slice(0, mysqlRoutineFixture.indexOf("\nSELECT 2;")).replace(/;$/, "").trim(), "SELECT 2"]); expect(rangeSqlTexts(ranges)).toEqual([mysqlRoutineFixture.slice(0, mysqlRoutineFixture.indexOf("\nSELECT 2;")).replace(/;$/, "").trim(), "SELECT 2"]);
@@ -2470,11 +2470,13 @@ function isSqlServerGoLine(sql: string, pos: number): boolean {
function startsDelimiterCommand(sql: string, pos: number): boolean { function startsDelimiterCommand(sql: string, pos: number): boolean {
const prefix = sql.slice(pos, pos + 9); 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 { 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(); const delimiter = match?.[1]?.trim();
return delimiter ? delimiter : null; return delimiter ? delimiter : null;
} }
+10
View File
@@ -1630,6 +1630,10 @@ fn first_sql_tokens(sql: &str, limit: usize) -> Vec<String> {
} }
fn parse_delimiter_command(line: &str) -> Option<&str> { 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 bytes = line.as_bytes();
let rest = if bytes.len() > 10 let rest = if bytes.len() > 10
&& (bytes[..10].eq_ignore_ascii_case(b"delimiter ") || bytes[..10].eq_ignore_ascii_case(b"delimiter\t")) && (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"]); 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] #[test]
fn delimiter_case_insensitive() { fn delimiter_case_insensitive() {
let sql = "delimiter //\nSELECT 1//\ndelimiter ;\nSELECT 2;"; let sql = "delimiter //\nSELECT 1//\ndelimiter ;\nSELECT 2;";