diff --git a/apps/desktop/src/components/editor/EditorSettingsDialog.vue b/apps/desktop/src/components/editor/EditorSettingsDialog.vue index 9cbe8d0748..f8ecf6c962 100644 --- a/apps/desktop/src/components/editor/EditorSettingsDialog.vue +++ b/apps/desktop/src/components/editor/EditorSettingsDialog.vue @@ -265,6 +265,7 @@ const editAutoCloseBrackets = ref(settingsStore.editorSettings.autoCloseBrackets const editSqlSemanticDiagnosticsMode = ref(settingsStore.editorSettings.sqlSemanticDiagnosticsMode); const editSqlSemanticDiagnosticsEnabled = ref(settingsStore.editorSettings.sqlSemanticDiagnosticsEnabled); const editConfirmDangerousSqlExecution = ref(settingsStore.editorSettings.confirmDangerousSqlExecution); +const editContinueOnErrorOnBatch = ref(settingsStore.editorSettings.continueOnErrorOnBatch); const editConfirmUnsavedSqlClose = ref(settingsStore.editorSettings.confirmUnsavedSqlClose); const editAppLayout = ref(settingsStore.editorSettings.appLayout); const editShowTrayIcon = ref(settingsStore.desktopSettings.show_tray_icon); @@ -399,6 +400,7 @@ function currentEditorSettingsDraft(): EditorSettingsDraft { autoCloseBrackets: editAutoCloseBrackets.value, sqlSemanticDiagnosticsMode: editSqlSemanticDiagnosticsMode.value, confirmDangerousSqlExecution: editConfirmDangerousSqlExecution.value, + continueOnErrorOnBatch: editContinueOnErrorOnBatch.value, confirmUnsavedSqlClose: editConfirmUnsavedSqlClose.value, appLayout: editAppLayout.value, showColumnCommentsInHeader: editShowColumnCommentsInHeader.value, @@ -674,6 +676,7 @@ function syncEditorSettingsDraftFromStore() { editSqlSemanticDiagnosticsMode.value = settingsStore.editorSettings.sqlSemanticDiagnosticsMode; editSqlSemanticDiagnosticsEnabled.value = settingsStore.editorSettings.sqlSemanticDiagnosticsEnabled; editConfirmDangerousSqlExecution.value = settingsStore.editorSettings.confirmDangerousSqlExecution; + editContinueOnErrorOnBatch.value = settingsStore.editorSettings.continueOnErrorOnBatch; editConfirmUnsavedSqlClose.value = settingsStore.editorSettings.confirmUnsavedSqlClose; editAppLayout.value = settingsStore.editorSettings.appLayout; editShowColumnCommentsInHeader.value = settingsStore.editorSettings.showColumnCommentsInHeader; @@ -861,6 +864,7 @@ function resetDefaultsForTab(tab: SettingsCategory) { editSqlSemanticDiagnosticsMode.value = DEFAULT_EDITOR_SETTINGS.sqlSemanticDiagnosticsMode; editSqlSemanticDiagnosticsEnabled.value = DEFAULT_EDITOR_SETTINGS.sqlSemanticDiagnosticsEnabled; editConfirmDangerousSqlExecution.value = DEFAULT_EDITOR_SETTINGS.confirmDangerousSqlExecution; + editContinueOnErrorOnBatch.value = DEFAULT_EDITOR_SETTINGS.continueOnErrorOnBatch; editConfirmUnsavedSqlClose.value = DEFAULT_EDITOR_SETTINGS.confirmUnsavedSqlClose; editSqlVariableSyntaxOverrides.value = normalizeSqlVariableSyntaxOverrides(DEFAULT_EDITOR_SETTINGS.sqlVariableSyntaxOverrides); } else if (tab === "formatter") { @@ -2802,6 +2806,16 @@ onUnmounted(cleanupPreviewEditor); +
+
+ +

+ {{ t("settings.continueOnErrorOnBatchDescription") }} +

+
+ +
+
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts index 4a8ca188ef..31debdf7cd 100644 --- a/apps/desktop/src/i18n/locales/en.ts +++ b/apps/desktop/src/i18n/locales/en.ts @@ -3431,6 +3431,8 @@ export default { sqlSemanticDiagnosticsEnabledDescription: "When enabled, the editor reports semantic issues such as unknown tables and columns. Disable it to reduce parsing and metadata checks for large SQL.", confirmDangerousSqlExecution: "Confirm before dangerous SQL", confirmDangerousSqlExecutionDescription: "When disabled, ALTER, DROP, DELETE, TRUNCATE, and other dangerous SQL run without the warning dialog.", + continueOnErrorOnBatch: "Continue on Error", + continueOnErrorOnBatchDescription: "When enabled, multi-statement execution continues after an error instead of stopping at the first failure.", confirmUnsavedSqlClose: "Confirm before closing unsaved SQL", confirmUnsavedSqlCloseDescription: "When disabled, SQL tabs with unsaved edits close or quit without the save confirmation dialog.", prefillNewQueryWithSelect: "Prefill new query with SELECT *", diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts index 6a273d278d..b56f88b196 100644 --- a/apps/desktop/src/i18n/locales/es.ts +++ b/apps/desktop/src/i18n/locales/es.ts @@ -3221,6 +3221,8 @@ export default withEnglishFallback({ sqlSemanticDiagnosticsEnabledDescription: "Al activarse, el editor informa de problemas semánticos como tablas y columnas desconocidas. Desactívalo para reducir el análisis y las comprobaciones de metadatos en SQL grandes.", confirmDangerousSqlExecution: "Confirmar antes de SQL peligroso", confirmDangerousSqlExecutionDescription: "Cuando se desactiva, ALTER, DROP, DELETE, TRUNCATE y otras sentencias peligrosas se ejecutan sin el diálogo de advertencia.", + continueOnErrorOnBatch: "Continuar en error", + continueOnErrorOnBatchDescription: "Cuando está habilitado, la ejecución de múltiples sentencias continúa después de un error en lugar de detenerse en el primer fallo.", confirmUnsavedSqlClose: "Confirmar antes de cerrar SQL sin guardar", confirmUnsavedSqlCloseDescription: "Cuando se desactiva, las pestañas SQL con ediciones sin guardar se cierran o salen sin el diálogo de confirmación de guardado.", prefillNewQueryWithSelect: "Rellenar nueva consulta con SELECT *", diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts index 55f657c00a..f59ddc2183 100644 --- a/apps/desktop/src/i18n/locales/it.ts +++ b/apps/desktop/src/i18n/locales/it.ts @@ -3219,6 +3219,8 @@ export default withEnglishFallback({ sqlSemanticDiagnosticsEnabledDescription: "Se abilitata, l'editor segnala problemi semantici come tabelle e colonne sconosciute. Disabilitala per ridurre l'analisi e i controlli dei metadati per file SQL di grandi dimensioni.", confirmDangerousSqlExecution: "Conferma prima di SQL pericoloso", confirmDangerousSqlExecutionDescription: "Se disattivato, ALTER, DROP, DELETE, TRUNCATE e altri SQL pericolosi verranno eseguiti senza la finestra di avviso.", + continueOnErrorOnBatch: "Continua in caso di errore", + continueOnErrorOnBatchDescription: "Se abilitato, l'esecuzione di più istruzioni continua dopo un errore invece di interrompersi al primo fallimento.", confirmUnsavedSqlClose: "Conferma prima di chiudere SQL non salvato", confirmUnsavedSqlCloseDescription: "Se disattivato, le schede SQL con modifiche non salvate verranno chiuse o usciranno senza la finestra di conferma di salvataggio.", prefillNewQueryWithSelect: "Precompila nuova query con SELECT *", diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts index 6da6290a47..2ee097296a 100644 --- a/apps/desktop/src/i18n/locales/ja.ts +++ b/apps/desktop/src/i18n/locales/ja.ts @@ -3209,6 +3209,8 @@ export default withEnglishFallback({ sqlSemanticDiagnosticsEnabledDescription: "有効時、エディタは不明なテーブルや列などの意味的な問題を表示します。大きなSQLの解析とメタデータ確認の負荷を減らすには無効にします。", confirmDangerousSqlExecution: "危険なSQLの前に確認", confirmDangerousSqlExecutionDescription: "無効時、ALTER、DROP、DELETE、TRUNCATEなどの危険なSQLが警告ダイアログなしで実行されます。", + continueOnErrorOnBatch: "エラー時も継続", + continueOnErrorOnBatchDescription: "有効にすると、複数SQL文の実行時にエラーが発生しても、最初の失敗で停止せずに後続の文を実行し続けます。", confirmUnsavedSqlClose: "未保存のSQLを閉じる前に確認", confirmUnsavedSqlCloseDescription: "無効時、未保存の編集があるSQLタブは保存確認ダイアログなしで閉じるか終了します。", prefillNewQueryWithSelect: "新規クエリに SELECT を自動入力", diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts index b2e1a88070..3d90e77b27 100644 --- a/apps/desktop/src/i18n/locales/pt-BR.ts +++ b/apps/desktop/src/i18n/locales/pt-BR.ts @@ -3221,6 +3221,8 @@ export default withEnglishFallback({ sqlSemanticDiagnosticsEnabledDescription: "Quando ativado, o editor relata problemas semânticos como tabelas e colunas desconhecidas. Desative para reduzir a análise e verificações de metadados em SQL grande.", confirmDangerousSqlExecution: "Confirmar antes de SQL perigoso", confirmDangerousSqlExecutionDescription: "Quando desativado, ALTER, DROP, DELETE, TRUNCATE e outros SQL perigosos são executados sem a caixa de diálogo de aviso.", + continueOnErrorOnBatch: "Continuar em erro", + continueOnErrorOnBatchDescription: "Quando ativado, a execução de múltiplas instruções continua após um erro em vez de parar na primeira falha.", confirmUnsavedSqlClose: "Confirmar antes de fechar SQL não salvo", confirmUnsavedSqlCloseDescription: "Quando desativado, abas SQL com edições não salvas são fechadas ou o app é encerrado sem a caixa de diálogo de confirmação de salvamento.", prefillNewQueryWithSelect: "Preencher nova consulta com SELECT *", diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts index bd6d11e629..a02b10f860 100644 --- a/apps/desktop/src/i18n/locales/zh-CN.ts +++ b/apps/desktop/src/i18n/locales/zh-CN.ts @@ -3430,6 +3430,8 @@ export default withEnglishFallback({ sqlSemanticDiagnosticsEnabledDescription: "开启后,编辑器会提示未知表、字段等语义问题;关闭可减少 SQL 解析和元数据检查的性能开销。", confirmDangerousSqlExecution: "执行危险 SQL 前弹出确认", confirmDangerousSqlExecutionDescription: "关闭后,ALTER、DROP、DELETE、TRUNCATE 等危险 SQL 将直接执行。", + continueOnErrorOnBatch: "批量执行遇错继续", + continueOnErrorOnBatchDescription: "开启后,多条 SQL 批量执行时遇到错误将继续执行后续语句,而非中断。", confirmUnsavedSqlClose: "关闭未保存 SQL 前弹出确认", confirmUnsavedSqlCloseDescription: "关闭后,有未保存内容的 SQL 标签页会直接关闭或退出,不再弹出保存确认。", prefillNewQueryWithSelect: "新建查询时预填充 SELECT 语句", diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts index 321040aa3c..805069df16 100644 --- a/apps/desktop/src/i18n/locales/zh-TW.ts +++ b/apps/desktop/src/i18n/locales/zh-TW.ts @@ -3070,6 +3070,8 @@ export default withEnglishFallback({ sqlSemanticDiagnosticsEnabledDescription: "開啟後,編輯器會提示未知資料表、欄位等語意問題;關閉可減少 SQL 解析和中繼資料檢查的效能負擔。", confirmDangerousSqlExecution: "執行危險 SQL 前彈出確認", confirmDangerousSqlExecutionDescription: "關閉後,ALTER、DROP、DELETE、TRUNCATE 等危險 SQL 會直接執行。", + continueOnErrorOnBatch: "批次執行遇錯繼續", + continueOnErrorOnBatchDescription: "開啟後,多條 SQL 批次執行時遇到錯誤將繼續執行後續語句,而非中斷。", confirmUnsavedSqlClose: "關閉未儲存 SQL 前彈出確認", confirmUnsavedSqlCloseDescription: "關閉後,有未儲存內容的 SQL 分頁會直接關閉或結束,不再彈出儲存確認。", prefillNewQueryWithSelect: "新建查詢時預填 SELECT 語句", diff --git a/apps/desktop/src/lib/backend/http.ts b/apps/desktop/src/lib/backend/http.ts index cee2a84bb8..8a09cac17a 100644 --- a/apps/desktop/src/lib/backend/http.ts +++ b/apps/desktop/src/lib/backend/http.ts @@ -706,6 +706,7 @@ export async function executeMulti( clientSessionId?: string; timeoutSecs?: number; useTransaction?: boolean; + continueOnError?: boolean; }, ): Promise { return post("/api/query/execute-multi", { connectionId, database, sql, schema, executionId, ...options }); diff --git a/apps/desktop/src/lib/backend/tauri.ts b/apps/desktop/src/lib/backend/tauri.ts index c58b965721..79a5e1be52 100644 --- a/apps/desktop/src/lib/backend/tauri.ts +++ b/apps/desktop/src/lib/backend/tauri.ts @@ -777,6 +777,7 @@ export async function executeMulti( clientSessionId?: string; timeoutSecs?: number; useTransaction?: boolean; + continueOnError?: boolean; }, ): Promise { return invoke("execute_multi", { connectionId, database, sql, schema, executionId, ...options }); diff --git a/apps/desktop/src/lib/settings/__tests__/editorSettingsDraft.spec.ts b/apps/desktop/src/lib/settings/__tests__/editorSettingsDraft.spec.ts new file mode 100644 index 0000000000..17b70f1f7e --- /dev/null +++ b/apps/desktop/src/lib/settings/__tests__/editorSettingsDraft.spec.ts @@ -0,0 +1,81 @@ +import { describe, expect, it } from "vitest"; +import { EDITOR_SETTINGS_DRAFT_KEYS, editorSettingsDraftFromSettings, editorSettingsDraftChanged, editorSettingsPatchFromDraft } from "../editorSettingsDraft"; +import type { EditorSettings } from "@/stores/settingsStore"; + +function makeSettings(overrides: Partial = {}): EditorSettings { + return { + autoCalculateTotalRows: false, + pageSize: 100, + sqlEngine: "desktop", + tabSize: 2, + keywordCase: "upper", + indentStyle: "standard", + lineWidth: 80, + commaPosition: "end", + editorFontFamily: "", + editorFontSize: 0, + editorLineHeight: 0, + maxRowsPerPage: 50000, + showHiddenFiles: false, + confirmDangerousSqlExecution: true, + continueOnErrorOnBatch: false, + confirmUnsavedSqlClose: true, + objectBrowserViewMode: "list", + sqlVariableSyntaxOverrides: {}, + ...overrides, + }; +} + +describe("EDITOR_SETTINGS_DRAFT_KEYS", () => { + it("includes continueOnErrorOnBatch", () => { + expect(EDITOR_SETTINGS_DRAFT_KEYS).toContain("continueOnErrorOnBatch"); + }); +}); + +describe("editorSettingsDraftFromSettings", () => { + it("maps continueOnErrorOnBatch from settings", () => { + const draft = editorSettingsDraftFromSettings(makeSettings({ continueOnErrorOnBatch: true })); + expect(draft.continueOnErrorOnBatch).toBe(true); + }); + + it("maps continueOnErrorOnBatch=false from settings", () => { + const draft = editorSettingsDraftFromSettings(makeSettings({ continueOnErrorOnBatch: false })); + expect(draft.continueOnErrorOnBatch).toBe(false); + }); +}); + +describe("editorSettingsDraftChanged", () => { + it("detects change in continueOnErrorOnBatch", () => { + const settings = makeSettings({ continueOnErrorOnBatch: false }); + const draft = editorSettingsDraftFromSettings(settings); + const base = editorSettingsDraftFromSettings(settings); + draft.continueOnErrorOnBatch = true; + expect(editorSettingsDraftChanged(draft, base)).toBe(true); + }); + + it("detects no change when continueOnErrorOnBatch matches", () => { + const settings = makeSettings({ continueOnErrorOnBatch: false }); + const draft = editorSettingsDraftFromSettings(settings); + const base = editorSettingsDraftFromSettings(settings); + expect(editorSettingsDraftChanged(draft, base)).toBe(false); + }); +}); + +describe("editorSettingsPatchFromDraft", () => { + it("includes continueOnErrorOnBatch in patch when changed", () => { + const settings = makeSettings({ continueOnErrorOnBatch: false }); + const draft = editorSettingsDraftFromSettings(settings); + const base = editorSettingsDraftFromSettings(settings); + draft.continueOnErrorOnBatch = true; + const patch = editorSettingsPatchFromDraft(draft, base); + expect(patch.continueOnErrorOnBatch).toBe(true); + }); + + it("omits continueOnErrorOnBatch when unchanged", () => { + const settings = makeSettings({ continueOnErrorOnBatch: false }); + const draft = editorSettingsDraftFromSettings(settings); + const base = editorSettingsDraftFromSettings(settings); + const patch = editorSettingsPatchFromDraft(draft, base); + expect(patch.continueOnErrorOnBatch).toBeUndefined(); + }); +}); diff --git a/apps/desktop/src/lib/settings/editorSettingsDraft.ts b/apps/desktop/src/lib/settings/editorSettingsDraft.ts index 75ec3c2cbe..8de49aecf5 100644 --- a/apps/desktop/src/lib/settings/editorSettingsDraft.ts +++ b/apps/desktop/src/lib/settings/editorSettingsDraft.ts @@ -51,6 +51,7 @@ export const EDITOR_SETTINGS_DRAFT_KEYS = [ "toolbarItems", "snippets", "sqlVariableSyntaxOverrides", + "continueOnErrorOnBatch", ] as const satisfies readonly (keyof EditorSettings)[]; export type EditorSettingsDraftKey = (typeof EDITOR_SETTINGS_DRAFT_KEYS)[number]; diff --git a/apps/desktop/src/stores/__tests__/queryStore.multiStatementError.spec.ts b/apps/desktop/src/stores/__tests__/queryStore.multiStatementError.spec.ts index 309b27af5a..08082e2b79 100644 --- a/apps/desktop/src/stores/__tests__/queryStore.multiStatementError.spec.ts +++ b/apps/desktop/src/stores/__tests__/queryStore.multiStatementError.spec.ts @@ -30,7 +30,7 @@ vi.mock("@/stores/connectionStore", () => ({ vi.mock("@/stores/settingsStore", () => ({ useSettingsStore: () => ({ - editorSettings: { autoCalculateTotalRows: false, pageSize: 100 }, + editorSettings: { autoCalculateTotalRows: false, pageSize: 100, continueOnErrorOnBatch: false }, }), })); @@ -138,4 +138,15 @@ describe("queryStore multi-statement errors", () => { expect(tab.activeResultIndex).toBe(0); expect(tab.result?.columns).toEqual(["value"]); }); + + it("passes continueOnError=false from settings to executeMulti by default", async () => { + mocks.executeMulti.mockResolvedValue([{ columns: ["value"], rows: [[1]], affected_rows: 0, execution_time_ms: 1 }]); + const { useQueryStore } = await import("@/stores/queryStore"); + const store = useQueryStore(); + const tabId = store.createTab("mysql-1", "app", "Query"); + + await store.executeTabSql(tabId, "SELECT 1"); + + expect(mocks.executeMulti).toHaveBeenCalledWith("mysql-1", "app", "SELECT 1", undefined, expect.any(String), expect.objectContaining({ continueOnError: false })); + }); }); diff --git a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts index cbb884b6a2..b0f2f1a925 100644 --- a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts +++ b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts @@ -112,3 +112,18 @@ describe("normalizeDesktopSettings", () => { expect(normalizeDesktopSettings({ duckdb_worker_max_processes: 3.6 }).duckdb_worker_max_processes).toBe(4); }); }); + +describe("normalizeEditorSettings - continueOnErrorOnBatch", () => { + it("defaults continueOnErrorOnBatch to false", () => { + expect(normalizeEditorSettings({}).continueOnErrorOnBatch).toBe(false); + }); + + it("preserves enabled continueOnErrorOnBatch", () => { + expect(normalizeEditorSettings({ continueOnErrorOnBatch: true }).continueOnErrorOnBatch).toBe(true); + }); + + it("treats non-boolean values as false", () => { + expect(normalizeEditorSettings({ continueOnErrorOnBatch: "yes" } as any).continueOnErrorOnBatch).toBe(false); + expect(normalizeEditorSettings({ continueOnErrorOnBatch: 1 } as any).continueOnErrorOnBatch).toBe(false); + }); +}); diff --git a/apps/desktop/src/stores/queryStore.ts b/apps/desktop/src/stores/queryStore.ts index 426073d1df..d1a5dc36c2 100644 --- a/apps/desktop/src/stores/queryStore.ts +++ b/apps/desktop/src/stores/queryStore.ts @@ -3001,6 +3001,7 @@ export const useQueryStore = defineStore("query", () => { : {}), ...(clientSessionId ? { clientSessionId } : {}), timeoutSecs: queryTimeoutSecs, + continueOnError: settingsStore.editorSettings.continueOnErrorOnBatch, }; console.info("[DBX][executeTabSql:execute-multi:invoke]", { traceId, diff --git a/apps/desktop/src/stores/settingsStore.ts b/apps/desktop/src/stores/settingsStore.ts index b0991f10ba..ceefcde617 100644 --- a/apps/desktop/src/stores/settingsStore.ts +++ b/apps/desktop/src/stores/settingsStore.ts @@ -432,6 +432,7 @@ export interface EditorSettings { objectBrowserShowCheckbox: boolean; objectBrowserViewMode: "list" | "grid"; sqlVariableSyntaxOverrides: SqlVariableSyntaxOverrides; + continueOnErrorOnBatch: boolean; } export interface ToolbarItems { @@ -569,6 +570,7 @@ export const DEFAULT_EDITOR_SETTINGS: EditorSettings = { objectBrowserShowCheckbox: false, objectBrowserViewMode: "list", sqlVariableSyntaxOverrides: {}, + continueOnErrorOnBatch: false, }; export const STORAGE_KEY = "dbx-editor-settings"; @@ -806,6 +808,7 @@ export function normalizeEditorSettings(settings: Partial, exist objectBrowserShowCheckbox: typeof settings.objectBrowserShowCheckbox === "boolean" ? settings.objectBrowserShowCheckbox : DEFAULT_EDITOR_SETTINGS.objectBrowserShowCheckbox, objectBrowserViewMode: settings.objectBrowserViewMode === "grid" ? "grid" : DEFAULT_EDITOR_SETTINGS.objectBrowserViewMode, sqlVariableSyntaxOverrides: normalizeSqlVariableSyntaxOverrides(settings.sqlVariableSyntaxOverrides), + continueOnErrorOnBatch: settings.continueOnErrorOnBatch === true, }; } @@ -1055,6 +1058,7 @@ export const useSettingsStore = defineStore("settings", () => { if (partial.objectBrowserShowCheckbox !== undefined) editorSettings.value.objectBrowserShowCheckbox = partial.objectBrowserShowCheckbox === true; if (partial.objectBrowserViewMode !== undefined) editorSettings.value.objectBrowserViewMode = partial.objectBrowserViewMode === "grid" ? "grid" : "list"; if (partial.sqlVariableSyntaxOverrides !== undefined) editorSettings.value.sqlVariableSyntaxOverrides = normalizeSqlVariableSyntaxOverrides(partial.sqlVariableSyntaxOverrides); + if (partial.continueOnErrorOnBatch !== undefined) editorSettings.value.continueOnErrorOnBatch = partial.continueOnErrorOnBatch === true; saveEditorSettings(editorSettings.value); } diff --git a/crates/dbx-core/src/query.rs b/crates/dbx-core/src/query.rs index 2979bd59c4..3a0b9fe847 100644 --- a/crates/dbx-core/src/query.rs +++ b/crates/dbx-core/src/query.rs @@ -305,6 +305,10 @@ pub struct QueryExecutionOptions { /// (BEGIN … COMMIT) instead of auto-commit mode. `None` and `Some(false)` behave /// identically — auto-commit for each statement. pub use_transaction: Option, + /// When `true`, multi-statement execution continues after an error instead of + /// stopping at the first failure. Currently affects MySQL-protocol batch execution; + /// other databases already continue on error. + pub continue_on_error: bool, } fn query_result_row_limit(max_rows: Option) -> usize { @@ -1970,6 +1974,7 @@ async fn execute_mysql_batch_statements( statements: &[String], db_type: Option, cancel_token: Option, + continue_on_error: bool, ) -> (Vec, Option) where E: MysqlBatchStatementExecutor, @@ -1986,8 +1991,11 @@ where Err(err) => { let action = pool_error_action(db_type, &err); results.push(ExecuteMultiResult::execution_error(error_query_result(err))); - // Do not run dependent statements after any MySQL-protocol statement fails. - return (results, Some(action)); + // Statement errors are safe to collect, but connection-level failures leave + // the protocol state unusable and must still trigger pool cleanup. + if !continue_on_error || action != PoolErrorAction::Keep { + return (results, Some(action)); + } } } } @@ -2039,7 +2047,8 @@ async fn execute_multi_mysql( dialect, }; let (results, error_action) = - execute_mysql_batch_statements(&mut executor, statements, db_type, cancel_token).await; + execute_mysql_batch_statements(&mut executor, statements, db_type, cancel_token, options.continue_on_error) + .await; drop(executor); if matches!(error_action, Some(PoolErrorAction::Discard | PoolErrorAction::ReconnectAndRetry)) { @@ -3247,7 +3256,7 @@ mod tests { }; let (results, error_action) = - execute_mysql_batch_statements(&mut executor, &statements, Some(DatabaseType::Mysql), None).await; + execute_mysql_batch_statements(&mut executor, &statements, Some(DatabaseType::Mysql), None, false).await; assert_eq!(executor.executed, vec!["first", "fails"]); assert_eq!(results.len(), 2); @@ -3255,6 +3264,48 @@ mod tests { assert_eq!(error_action, Some(PoolErrorAction::Keep)); } + #[tokio::test] + async fn mysql_batch_continues_after_statement_errors_when_enabled() { + let statements = vec!["first".to_string(), "fails".to_string(), "third".to_string()]; + let mut executor = FakeMysqlBatchExecutor { + outcomes: std::collections::VecDeque::from([ + Ok(empty_query_result(0)), + Err("Duplicate entry".to_string()), + Ok(empty_query_result(0)), + ]), + executed: Vec::new(), + }; + + let (results, error_action) = + execute_mysql_batch_statements(&mut executor, &statements, Some(DatabaseType::Mysql), None, true).await; + + assert_eq!(executor.executed, statements); + assert_eq!(results.len(), 3); + assert!(results[1].execution_error); + assert_eq!(error_action, None); + } + + #[tokio::test] + async fn mysql_batch_stops_on_connection_errors_when_continue_is_enabled() { + let statements = vec!["first".to_string(), "disconnects".to_string(), "must-not-run".to_string()]; + let mut executor = FakeMysqlBatchExecutor { + outcomes: std::collections::VecDeque::from([ + Ok(empty_query_result(0)), + Err("connection reset by peer".to_string()), + Ok(empty_query_result(0)), + ]), + executed: Vec::new(), + }; + + let (results, error_action) = + execute_mysql_batch_statements(&mut executor, &statements, Some(DatabaseType::Mysql), None, true).await; + + assert_eq!(executor.executed, vec!["first", "disconnects"]); + assert_eq!(results.len(), 2); + assert!(results[1].execution_error); + assert_eq!(error_action, Some(PoolErrorAction::ReconnectAndRetry)); + } + #[test] fn execute_multi_result_serializes_error_marker_only_for_synthesized_errors() { let success = serde_json::to_value(ExecuteMultiResult::from(empty_query_result(0))).unwrap(); diff --git a/crates/dbx-web/src/routes/query.rs b/crates/dbx-web/src/routes/query.rs index e818c9e1a8..d037c9c422 100644 --- a/crates/dbx-web/src/routes/query.rs +++ b/crates/dbx-web/src/routes/query.rs @@ -23,6 +23,7 @@ pub struct ExecuteQueryRequest { pub client_session_id: Option, pub timeout_secs: Option, pub use_transaction: Option, + pub continue_on_error: Option, } #[derive(Deserialize)] @@ -372,7 +373,7 @@ pub async fn execute_multi( timeout_secs: req.timeout_secs, execution_id: Some(execution_id), use_transaction: req.use_transaction, - ..Default::default() + continue_on_error: req.continue_on_error.unwrap_or(false), }, ) .await diff --git a/src-tauri/src/commands/query.rs b/src-tauri/src/commands/query.rs index 6a26d1f390..b8e69f678d 100644 --- a/src-tauri/src/commands/query.rs +++ b/src-tauri/src/commands/query.rs @@ -70,6 +70,7 @@ pub async fn execute_multi( client_session_id: Option, timeout_secs: Option, use_transaction: Option, + continue_on_error: Option, ) -> Result, String> { let execution_id = execution_id.filter(|id| !id.trim().is_empty()); let registered_query = execution_id.as_ref().map(|id| { @@ -106,6 +107,7 @@ pub async fn execute_multi( timeout_secs, execution_id, use_transaction, + continue_on_error: continue_on_error.unwrap_or(false), }, ) .await;