fix(query): continue batch after statement errors

This commit is contained in:
gggaiitx authored and GitHub committed 2026-07-14 12:51:24 +08:00
1 parent 88d05a0a19
commit e9e59113a3
19 files changed
+203 -6

No files matched your search

+1
View File
@@ -706,6 +706,7 @@ export async function executeMulti(
clientSessionId?: string;
timeoutSecs?: number;
useTransaction?: boolean;
continueOnError?: boolean;
},
): Promise<QueryResult[]> {
return post("/api/query/execute-multi", { connectionId, database, sql, schema, executionId, ...options });
+1
View File
@@ -777,6 +777,7 @@ export async function executeMulti(
clientSessionId?: string;
timeoutSecs?: number;
useTransaction?: boolean;
continueOnError?: boolean;
},
): Promise<QueryResult[]> {
return invoke("execute_multi", { connectionId, database, sql, schema, executionId, ...options });
@@ -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> = {}): 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();
});
});
@@ -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];