From ae21053f6967554947fcd4915dbbb05452f8fa39 Mon Sep 17 00:00:00 2001
From: t8y2 <1156263951@qq.com>
Date: Mon, 4 May 2026 02:33:57 +0800
Subject: [PATCH] feat: add execute_multi command and update query handling for
 multiple results

---
 src-tauri/src/commands/query.rs | 54 +++++++++++++++++++++++++++++++++
 src-tauri/src/lib.rs            |  1 +
 src/App.vue                     | 15 ++++++++-
 src/i18n/locales/en.ts          |  1 +
 src/i18n/locales/zh-CN.ts       |  1 +
 src/lib/tauri.ts                |  4 +++
 src/stores/queryStore.ts        | 24 ++++++++++++++-
 src/types/database.ts           |  2 ++
 8 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/src-tauri/src/commands/query.rs b/src-tauri/src/commands/query.rs
index 4639dc7e67..d988902814 100644
--- a/src-tauri/src/commands/query.rs
+++ b/src-tauri/src/commands/query.rs
@@ -262,6 +262,60 @@ pub async fn execute_query(
     result
 }
 
+#[tauri::command]
+pub async fn execute_multi(
+    state: State<'_, Arc<AppState>>,
+    connection_id: String,
+    database: String,
+    sql: String,
+    execution_id: Option<String>,
+) -> Result<Vec<db::QueryResult>, String> {
+    let registered_query = execution_id
+        .as_ref()
+        .filter(|id| !id.trim().is_empty())
+        .map(|id| state.running_queries.register(id.clone()));
+    let cancel_token = registered_query.as_ref().map(|query| query.token());
+
+    let statements = split_sql_statements(&sql);
+    if statements.len() <= 1 {
+        let single_sql = statements.into_iter().next().unwrap_or_default();
+        let result = execute_sql_statement(
+            &state, &connection_id, &database, &single_sql, cancel_token,
+        ).await?;
+        return Ok(vec![result]);
+    }
+
+    let mut results = Vec::with_capacity(statements.len());
+    for stmt in &statements {
+        if is_canceled(&cancel_token) {
+            results.push(db::QueryResult {
+                columns: vec!["Error".to_string()],
+                rows: vec![vec![serde_json::Value::String(canceled_error())]],
+                affected_rows: 0,
+                execution_time_ms: 0,
+                truncated: false,
+            });
+            break;
+        }
+        match execute_sql_statement(
+            &state, &connection_id, &database, stmt, cancel_token.clone(),
+        ).await {
+            Ok(r) => results.push(r),
+            Err(e) => {
+                results.push(db::QueryResult {
+                    columns: vec!["Error".to_string()],
+                    rows: vec![vec![serde_json::Value::String(e)]],
+                    affected_rows: 0,
+                    execution_time_ms: 0,
+                    truncated: false,
+                });
+            }
+        }
+    }
+
+    Ok(results)
+}
+
 #[tauri::command]
 pub async fn cancel_query(
     state: State<'_, Arc<AppState>>,
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 0db3e20626..a70203ef47 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -63,6 +63,7 @@ pub fn run() {
             commands::schema::list_triggers,
             commands::schema::get_table_ddl,
             commands::query::execute_query,
+            commands::query::execute_multi,
             commands::query::cancel_query,
             commands::query::execute_batch,
             commands::query::execute_script,
diff --git a/src/App.vue b/src/App.vue
index 0c116b066f..1995af72c2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1320,6 +1320,19 @@ async function setupFileDrop() {
                       >
                         {{ t('tabs.tableData') }}
                       </Button>
+                      <template v-if="activeOutputView === 'result' && activeTab.results && activeTab.results.length > 1">
+                        <span class="mx-1 h-4 w-px bg-border" />
+                        <Button
+                          v-for="(_, rIdx) in activeTab.results"
+                          :key="rIdx"
+                          size="sm"
+                          :variant="activeTab.activeResultIndex === rIdx ? 'default' : 'ghost'"
+                          class="h-6 px-2 text-xs"
+                          @click="queryStore.setActiveResultIndex(activeTab.id, rIdx)"
+                        >
+                          {{ t('tabs.resultN', { n: rIdx + 1 }) }}
+                        </Button>
+                      </template>
                       <Button
                         size="sm"
                         :variant="activeOutputView === 'explain' ? 'secondary' : 'ghost'"
@@ -1343,7 +1356,7 @@ async function setupFileDrop() {
                     />
 
                     <template v-else>
-                      <DataGrid v-if="activeTab.result" :key="activeTab.id" class="flex-1 min-h-0" :result="activeTab.result" :sql="activeTab.lastExecutedSql || activeTab.sql" :loading="activeTab.isExecuting" />
+                      <DataGrid v-if="activeTab.result" :key="`${activeTab.id}-${activeTab.activeResultIndex ?? 0}`" class="flex-1 min-h-0" :result="activeTab.result" :sql="activeTab.lastExecutedSql || activeTab.sql" :loading="activeTab.isExecuting" />
                       <div v-if="activeTab.result?.columns.includes('Error')" class="flex items-center gap-2 px-3 py-1.5 border-t bg-destructive/5">
                         <Bot class="h-3.5 w-3.5 text-destructive" />
                         <button class="text-xs text-destructive hover:underline" @click="fixWithAi(String(activeTab.result?.rows?.[0]?.[0] ?? ''))">
diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts
index 442ff0c298..0d9177a297 100644
--- a/src/i18n/locales/en.ts
+++ b/src/i18n/locales/en.ts
@@ -94,6 +94,7 @@ export default {
     tooltipDatabase: "Database:",
     tooltipTable: "Table:",
     tooltipCollection: "Collection:",
+    resultN: "Result {n}",
   },
   grid: {
     rows: "{count} rows",
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 4a405c8164..b8fe48670f 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -96,6 +96,7 @@ export default {
     tooltipDatabase: "数据库：",
     tooltipTable: "表：",
     tooltipCollection: "集合：",
+    resultN: "结果 {n}",
   },
   grid: {
     rows: "{count} 行",
diff --git a/src/lib/tauri.ts b/src/lib/tauri.ts
index 4f242439b6..cc70128aee 100644
--- a/src/lib/tauri.ts
+++ b/src/lib/tauri.ts
@@ -138,6 +138,10 @@ export async function executeQuery(connectionId: string, database: string, sql:
   return invoke("execute_query", { connectionId, database, sql, executionId });
 }
 
+export async function executeMulti(connectionId: string, database: string, sql: string, executionId?: string): Promise<QueryResult[]> {
+  return invoke("execute_multi", { connectionId, database, sql, executionId });
+}
+
 export async function cancelQuery(executionId: string): Promise<boolean> {
   return invoke("cancel_query", { executionId });
 }
diff --git a/src/stores/queryStore.ts b/src/stores/queryStore.ts
index e2f8c9d33e..8b0555b8c3 100644
--- a/src/stores/queryStore.ts
+++ b/src/stores/queryStore.ts
@@ -174,11 +174,25 @@ export const useQueryStore = defineStore("query", () => {
     tab.executionId = executionId;
     tab.lastExecutedSql = sql;
     try {
-      tab.result = await api.executeQuery(tab.connectionId, tab.database, sql, executionId);
+      const results = await api.executeMulti(tab.connectionId, tab.database, sql, executionId);
+      const current = tabs.value.find((t) => t.id === id);
+      if (current?.executionId === executionId) {
+        if (results.length > 1) {
+          current.results = results;
+          current.activeResultIndex = 0;
+          current.result = results[0];
+        } else {
+          current.results = undefined;
+          current.activeResultIndex = undefined;
+          current.result = results[0];
+        }
+      }
     } catch (e: any) {
       const current = tabs.value.find((t) => t.id === id);
       if (current?.executionId === executionId) {
         current.result = toErrorResult(e);
+        current.results = undefined;
+        current.activeResultIndex = undefined;
       }
     } finally {
       const current = tabs.value.find((t) => t.id === id);
@@ -277,6 +291,13 @@ export const useQueryStore = defineStore("query", () => {
     }
   }
 
+  function setActiveResultIndex(id: string, index: number) {
+    const tab = tabs.value.find((t) => t.id === id);
+    if (!tab?.results || index < 0 || index >= tab.results.length) return;
+    tab.activeResultIndex = index;
+    tab.result = tab.results[index];
+  }
+
   function trimResultCache() {
     const inactive = tabs.value.filter((t) => t.id !== activeTabId.value && t.result);
     if (inactive.length > MAX_CACHED_RESULTS) {
@@ -299,6 +320,7 @@ export const useQueryStore = defineStore("query", () => {
     setTableMeta,
     setExecuting,
     setErrorResult,
+    setActiveResultIndex,
     executeCurrentTab,
     executeCurrentSql,
     executeTabSql,
diff --git a/src/types/database.ts b/src/types/database.ts
index f9142dd1f2..1b07fda065 100644
--- a/src/types/database.ts
+++ b/src/types/database.ts
@@ -110,6 +110,8 @@ export interface QueryTab {
   lastExecutedSql?: string;
   pinned?: boolean;
   result?: QueryResult;
+  results?: QueryResult[];
+  activeResultIndex?: number;
   explainPlan?: import("@/lib/explainPlan").ParsedExplainPlan;
   explainError?: string;
   explainSql?: string;