From cd273441a3fbdf26ac74cf3c61cfca683cd32ecc Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Thu, 30 Apr 2026 09:42:34 +0800 Subject: [PATCH] feat: add execute_batch command for executing multiple SQL statements in a single call --- src-tauri/src/commands/query.rs | 43 +++++++++++++++++++++++++++++++ src-tauri/src/db/oracle_driver.rs | 2 +- src-tauri/src/lib.rs | 1 + src/components/grid/DataGrid.vue | 18 ++++++++++--- src/lib/tauri.ts | 4 +++ 5 files changed, 63 insertions(+), 5 deletions(-) diff --git a/src-tauri/src/commands/query.rs b/src-tauri/src/commands/query.rs index 6256d28de..d00a47b22 100644 --- a/src-tauri/src/commands/query.rs +++ b/src-tauri/src/commands/query.rs @@ -170,3 +170,46 @@ pub async fn execute_query( _ => result, } } + +#[tauri::command] +pub async fn execute_batch( + state: State<'_, Arc>, + connection_id: String, + database: String, + statements: Vec, +) -> Result { + let pool_key = if database.is_empty() { + connection_id.clone() + } else { + state.get_or_create_pool(&connection_id, Some(&database)).await? + }; + + let mut total_affected: u64 = 0; + let start = std::time::Instant::now(); + + for (i, sql) in statements.iter().enumerate() { + match do_execute(&state, &pool_key, sql).await { + Ok(result) => { + total_affected += result.affected_rows; + } + Err(e) => { + if is_connection_error(&e) { + let db_opt = if database.is_empty() { None } else { Some(database.as_str()) }; + let _ = state.reconnect_pool(&connection_id, db_opt).await; + } + return Err(format!( + "Statement {} failed: {}. Previous {} statement(s) may have been committed.", + i + 1, e, i + )); + } + } + } + + Ok(db::QueryResult { + columns: vec![], + rows: vec![], + affected_rows: total_affected, + execution_time_ms: start.elapsed().as_millis(), + truncated: false, + }) +} diff --git a/src-tauri/src/db/oracle_driver.rs b/src-tauri/src/db/oracle_driver.rs index 4eeb9e8aa..c459b903d 100644 --- a/src-tauri/src/db/oracle_driver.rs +++ b/src-tauri/src/db/oracle_driver.rs @@ -212,7 +212,7 @@ pub async fn execute_query(conn: &OracleClient, sql: &str) -> Result { let msg = e.to_string(); if msg.contains("Server rejected") || msg.contains("closed the connection") { - Err("Operation failed — possibly a constraint violation (foreign key, unique, or check constraint).".to_string()) + Err("Operation failed (connection closed) — possibly a constraint violation (foreign key, unique, or check constraint).".to_string()) } else { Err(msg) } diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index f02b4becf..15f1326bb 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -49,6 +49,7 @@ pub fn run() { commands::schema::list_triggers, commands::schema::get_table_ddl, commands::query::execute_query, + commands::query::execute_batch, commands::redis_cmd::redis_list_databases, commands::redis_cmd::redis_scan_keys, commands::redis_cmd::redis_get_value, diff --git a/src/components/grid/DataGrid.vue b/src/components/grid/DataGrid.vue index 22880b0d1..0b30e096d 100644 --- a/src/components/grid/DataGrid.vue +++ b/src/components/grid/DataGrid.vue @@ -353,10 +353,12 @@ function deleteSelectedRow() { } function escapeVal(v: CellValue): string { - if (v === null) return "NULL"; + if (v === null || v === undefined) return "NULL"; if (typeof v === "boolean") return v ? "TRUE" : "FALSE"; - if (typeof v === "number") return String(v); - return `'${String(v).replace(/'/g, "''")}'`; + if (typeof v === "number" && Number.isFinite(v)) return String(v); + const s = String(v); + if (s === "") return "''"; + return `'${s.replace(/\\/g, "\\\\").replace(/'/g, "''")}'`; } function qualifiedTableName(): string { @@ -407,7 +409,15 @@ async function saveChanges() { const stmts = generateSaveStatements(); if (stmts.length === 0) return; saveError.value = ""; - if (props.onExecuteSql) { + + if (props.connectionId && props.database) { + try { + await api.executeBatch(props.connectionId, props.database, stmts); + } catch (e: any) { + saveError.value = String(e.message || e); + return; + } + } else if (props.onExecuteSql) { try { for (const sql of stmts) { await props.onExecuteSql(sql); diff --git a/src/lib/tauri.ts b/src/lib/tauri.ts index 7b12b0a48..6555fc9c6 100644 --- a/src/lib/tauri.ts +++ b/src/lib/tauri.ts @@ -73,6 +73,10 @@ export async function executeQuery(connectionId: string, database: string, sql: return invoke("execute_query", { connectionId, database, sql }); } +export async function executeBatch(connectionId: string, database: string, statements: string[]): Promise { + return invoke("execute_batch", { connectionId, database, statements }); +} + export async function listIndexes(connectionId: string, database: string, schema: string, table: string): Promise { return invoke("list_indexes", { connectionId, database, schema, table }); }