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(hana): keep nested case sqlscript procedures together

zipg8be7a5b13144
diff --git a/apps/desktop/src/lib/__tests__/sql/sqlStatementRanges.spec.ts b/apps/desktop/src/lib/__tests__/sql/sqlStatementRanges.spec.ts
index 15b22a55cf..6e45b8d594 100644
--- a/apps/desktop/src/lib/__tests__/sql/sqlStatementRanges.spec.ts
+++ b/apps/desktop/src/lib/__tests__/sql/sqlStatementRanges.spec.ts
@@ -935,6 +935,26 @@ SELECT 2 FROM DUMMY;`;
expect(rangeSqlTexts(splitSqlStatementRanges(sql, "saphana"))).toEqual([sql.slice(0, sql.indexOf("\nSELECT 2")), "SELECT 2 FROM DUMMY"]);
});
+ it("keeps nested CASE expressions in a SAP HANA procedure GROUP BY together", () => {
+ const sql = `ALTER PROCEDURE PUBLIC.P
+LANGUAGE SQLSCRIPT
+SQL SECURITY INVOKER
+AS
+BEGIN
+ T = SELECT 1 FROM DUMMY
+ GROUP BY
+ CASE WHEN KHLX='老客' THEN CASE WHEN SCYEAR='0000' THEN NULL ELSE SCYEAR END ELSE LEFT(CASE WHEN SCDAT_OLD='00000000' THEN NULL ELSE SCDAT_OLD END,4) END,
+ CASE WHEN KHLX='老客' THEN CASE WHEN SCDAT='00000000' THEN NULL ELSE SCDAT END ELSE (CASE WHEN SCDAT_OLD='00000000' THEN NULL ELSE SCDAT_OLD END)END;
+END;
+SELECT 2 FROM DUMMY;`;
+
+ expect(rangeSqlTexts(splitSqlStatementRanges(sql, "saphana"))).toEqual([sql.slice(0, sql.indexOf("\nSELECT 2")), "SELECT 2 FROM DUMMY"]);
+ });
+
+ it.each(["DO BEGIN T = SELECT CASE WHEN 1 = 1 THEN 1 ELSE 0 END FROM DUMMY; END;", "do begin t = select 1 from dummy; end;"])("keeps single-line SAP HANA blocks together: %s", (sql) => {
+ expect(rangeSqlTexts(splitSqlStatementRanges(sql, "saphana"))).toEqual([sql]);
+ });
+
it("still splits SAP HANA ALTER PROCEDURE metadata commands", () => {
expect(rangeSqlTexts(splitSqlStatementRanges("ALTER PROCEDURE PUBLIC.P RECOMPILE; SELECT 1 FROM DUMMY;", "saphana"))).toEqual(["ALTER PROCEDURE PUBLIC.P RECOMPILE", "SELECT 1 FROM DUMMY"]);
});
diff --git a/apps/desktop/src/lib/sql/sqlStatementRanges.ts b/apps/desktop/src/lib/sql/sqlStatementRanges.ts
index c2fc321c2c..16e2e9c0fc 100644
--- a/apps/desktop/src/lib/sql/sqlStatementRanges.ts
+++ b/apps/desktop/src/lib/sql/sqlStatementRanges.ts
@@ -2284,8 +2284,20 @@ function startsWithSapHanaScriptBlock(sql: string): boolean {
function sapHanaScriptBlockIsComplete(sql: string): boolean {
if (!startsWithSapHanaScriptBlock(sql)) return false;
+ const lastNewline = sql.lastIndexOf("\n");
+ if (
+ lastNewline >= 0 &&
+ !sql
+ .slice(lastNewline + 1)
+ .trimStart()
+ .toUpperCase()
+ .startsWith("END;")
+ )
+ return false;
+
const tokens = oraclePlSqlTokens(sql);
- const stack: string[] = [];
+ let blockDepth = 0;
+ let caseDepth = 0;
let sawBegin = false;
for (let index = 0; index < tokens.length; index += 1) {
@@ -2294,23 +2306,26 @@ function sapHanaScriptBlockIsComplete(sql: string): boolean {
if (token.value === "BEGIN") {
if (previousWordToken(tokens, index) === "END") continue;
- stack.push("BLOCK");
+ blockDepth += 1;
sawBegin = true;
continue;
}
- if (token.value === "IF" || token.value === "FOR" || token.value === "WHILE" || token.value === "CASE") {
- if (previousWordToken(tokens, index) !== "END") stack.push(token.value);
+ if (token.value === "CASE") {
+ if (previousWordToken(tokens, index) !== "END") caseDepth += 1;
continue;
}
if (token.value === "END") {
const next = nextWordToken(tokens, index);
- const top = stack[stack.length - 1];
- const target = SAP_HANA_SCRIPT_BLOCK_TERMINATORS.has(next ?? "") ? next : top === "CASE" ? "CASE" : "BLOCK";
- if (top === target) stack.pop();
+ if (SAP_HANA_SCRIPT_BLOCK_TERMINATORS.has(next ?? "")) continue;
+ if (caseDepth > 0) {
+ caseDepth -= 1;
+ } else if (blockDepth > 0) {
+ blockDepth -= 1;
+ }
}
}
- return sawBegin && stack.length === 0 && tokens[tokens.length - 1]?.kind === "semicolon";
+ return sawBegin && blockDepth === 0 && caseDepth === 0 && tokens[tokens.length - 1]?.kind === "semicolon";
}
function oraclePlSqlBlockEnd(sql: string): number | null {
diff --git a/crates/dbx-sql-core/src/sql.rs b/crates/dbx-sql-core/src/sql.rs
index d9fbe97eea..5086f5f26a 100644
--- a/crates/dbx-sql-core/src/sql.rs
+++ b/crates/dbx-sql-core/src/sql.rs
@@ -3013,6 +3013,11 @@ fn starts_with_hana_script_block(sql: &str) -> bool {
}
fn hana_script_block_is_complete(sql: &str) -> bool {
+ if let Some((_, last_line)) = sql.rsplit_once('\n') {
+ if !last_line.trim_start().to_ascii_uppercase().starts_with("END;") {
+ return false;
+ }
+ }
HanaScriptBlock::parse(sql).is_complete()
}
@@ -3059,7 +3064,8 @@ impl HanaScriptBlock {
return false;
}
- let mut stack: Vec<String> = Vec::new();
+ let mut block_depth = 0usize;
+ let mut case_depth = 0usize;
let mut saw_begin = false;
for (index, token) in self.tokens.iter().enumerate() {
@@ -3067,31 +3073,33 @@ impl HanaScriptBlock {
if previous_word_token(&self.tokens, index).is_some_and(|previous| previous == "END") {
continue;
}
- stack.push("BLOCK".to_string());
+ block_depth += 1;
saw_begin = true;
continue;
}
- if token.is_any_word(&["IF", "FOR", "WHILE", "CASE"]) {
+ if token.is_word("CASE") {
if previous_word_token(&self.tokens, index).is_none_or(|previous| previous != "END") {
- stack.push(token.as_word().unwrap_or("BLOCK").to_string());
+ case_depth += 1;
}
continue;
}
if token.is_word("END") {
let next = next_word_token(&self.tokens, index);
- let top = stack.last().map(|value| value.as_str());
- let target = match next {
- Some(keyword @ ("IF" | "FOR" | "WHILE")) => keyword,
- _ if top == Some("CASE") => "CASE",
- _ => "BLOCK",
- };
- if top == Some(target) {
- stack.pop();
+ if matches!(next, Some("IF" | "FOR" | "WHILE")) {
+ continue;
+ }
+ if case_depth > 0 {
+ case_depth -= 1;
+ } else {
+ block_depth = block_depth.saturating_sub(1);
}
}
}
- saw_begin && stack.is_empty() && self.tokens.last().is_some_and(OraclePlSqlToken::is_semicolon)
+ saw_begin
+ && block_depth == 0
+ && case_depth == 0
+ && self.tokens.last().is_some_and(OraclePlSqlToken::is_semicolon)
}
}
@@ -5101,6 +5109,26 @@ SELECT 2 FROM DUMMY;";
);
}
+ #[test]
+ fn sap_hana_split_keeps_nested_case_group_by_inside_procedure_together() {
+ let sql = "ALTER PROCEDURE PUBLIC.P\nLANGUAGE SQLSCRIPT\nSQL SECURITY INVOKER\nAS\nBEGIN\n T = SELECT 1 FROM DUMMY\n GROUP BY\n CASE WHEN KHLX='老客' THEN CASE WHEN SCYEAR='0000' THEN NULL ELSE SCYEAR END ELSE LEFT(CASE WHEN SCDAT_OLD='00000000' THEN NULL ELSE SCDAT_OLD END,4) END,\n CASE WHEN KHLX='老客' THEN CASE WHEN SCDAT='00000000' THEN NULL ELSE SCDAT END ELSE (CASE WHEN SCDAT_OLD='00000000' THEN NULL ELSE SCDAT_OLD END)END;\nEND;\nSELECT 2 FROM DUMMY;";
+
+ assert_eq!(
+ split_sql_statements_for_database(sql, DatabaseType::SapHana),
+ vec![sql[..sql.rfind("\nSELECT 2").unwrap()].to_string(), "SELECT 2 FROM DUMMY".to_string()]
+ );
+ }
+
+ #[test]
+ fn sap_hana_split_handles_single_line_and_lowercase_end() {
+ for sql in [
+ "DO BEGIN T = SELECT CASE WHEN 1 = 1 THEN 1 ELSE 0 END FROM DUMMY; END;",
+ "do begin t = select 1 from dummy; end;",
+ ] {
+ assert_eq!(split_sql_statements_for_database(sql, DatabaseType::SapHana), vec![sql.to_string()]);
+ }
+ }
+
#[test]
fn sap_hana_plain_alter_procedure_still_flushes_at_semicolon() {
assert_eq!(