fix(query): continue batch after statement errors
This commit is contained in:
1 parent
88d05a0a19
commit
e9e59113a3
19 files changed
+203
-6
No files matched your search
@@ -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 }));
|
||||
});
|
||||
});
|
||||
@@ -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);
|
||||
});
|
||||
});
|
||||
@@ -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,
|
||||
|
||||
@@ -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<EditorSettings>, 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);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user