25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
fix(query): stop stale commits clearing newer transaction sessions
efeiree9b6e5fcb89c
diff --git a/apps/desktop/src/stores/__tests__/queryStore.manualTransactionCommit.spec.ts b/apps/desktop/src/stores/__tests__/queryStore.manualTransactionCommit.spec.tsnew file mode 100644index 0000000000..17562c6f62--- /dev/null+++ b/apps/desktop/src/stores/__tests__/queryStore.manualTransactionCommit.spec.ts@@ -0,0 +1,170 @@+import { createPinia, setActivePinia } from "pinia";+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";+import type { DatabaseType } from "@/types/database";++const mocks = vi.hoisted(() => ({+ beginManualTransaction: vi.fn(),+ closeClientConnectionSession: vi.fn(),+ commitManualTransaction: vi.fn(),+ rollbackManualTransaction: vi.fn(),+ saveOpenTabsState: vi.fn(),+}));++vi.mock("@/lib/backend/api", () => mocks);++function deferred<T>() {+ let resolve!: (value: T) => void;+ let reject!: (error: Error) => void;+ const promise = new Promise<T>((resolvePromise, rejectPromise) => {+ resolve = resolvePromise;+ reject = rejectPromise;+ });+ return { promise, resolve, reject };+}++async function setupManualTab(dbType: DatabaseType) {+ const { useConnectionStore } = await import("@/stores/connectionStore");+ const { useSettingsStore } = await import("@/stores/settingsStore");+ const { useQueryStore } = await import("@/stores/queryStore");+ useConnectionStore().connections.push(...["conn", "other-conn"].map((id) => ({ id, name: id, db_type: dbType, database: "ORCL", host: "localhost", port: 1521, username: "", password: "" })));+ useSettingsStore().editorSettings.confirmUnsavedSqlClose = false;+ const store = useQueryStore();+ const id = store.createTab("conn", "ORCL", "Query", "query", "APP");+ store.setAutoCommit(id, false);+ mocks.beginManualTransaction.mockResolvedValueOnce("txn-old");+ await store.ensureManualTransactionSession(id, "ORCL", "APP");+ store.markManualTransactionDirty(id);+ const tab = store.tabs.find((candidate) => candidate.id === id)!;+ return { store, id, tab };+}++async function finishCommit(commit: ReturnType<typeof deferred<void>>, committing: Promise<void>, outcome: "success" | "failure") {+ const error = new Error("Commit response lost");+ const settled = outcome === "success" ? expect(committing).resolves.toBeUndefined() : expect(committing).rejects.toBe(error);+ if (outcome === "success") commit.resolve();+ else commit.reject(error);+ await settled;+}++describe.each(["oracle", "oceanbase-oracle"] as const)("queryStore %s commit lifecycle", (dbType) => {+ beforeEach(() => {+ vi.resetAllMocks();+ vi.stubGlobal("localStorage", { getItem: () => null, setItem: () => {}, removeItem: () => {} });+ setActivePinia(createPinia());+ mocks.saveOpenTabsState.mockResolvedValue(undefined);+ mocks.closeClientConnectionSession.mockResolvedValue(undefined);+ mocks.rollbackManualTransaction.mockResolvedValue(undefined);+ });++ afterEach(() => vi.unstubAllGlobals());++ describe.each(["success", "failure"] as const)("old commit %s", (outcome) => {+ it.each(["mode", "schema", "database", "connection"] as const)("preserves a replacement transaction after a %s change", async (change) => {+ const { store, id, tab } = await setupManualTab(dbType);+ const commit = deferred<void>();+ mocks.commitManualTransaction.mockReturnValueOnce(commit.promise);+ const committing = store.commitTransaction(id);+ expect(mocks.commitManualTransaction).toHaveBeenCalledWith("txn-old");+ const rollback = deferred<void>();+ if (change === "schema") mocks.rollbackManualTransaction.mockReturnValueOnce(rollback.promise);++ if (change === "mode") {+ // Core removes the old session before awaiting COMMIT, so rollback can see not-found.+ mocks.rollbackManualTransaction.mockRejectedValueOnce(new Error("Transaction session not found"));+ store.setAutoCommit(id, true);+ store.setAutoCommit(id, false);+ } else if (change === "schema") store.updateSchema(id, "OTHER");+ else if (change === "database") store.updateDatabase(id, "OTHER");+ else {+ store.updateConnection(id, "other-conn", "OTHER");+ store.setAutoCommit(id, false);+ }+ mocks.beginManualTransaction.mockResolvedValueOnce("txn-new");+ await store.ensureManualTransactionSession(id, tab.database, tab.schema);+ store.markManualTransactionDirty(id);++ await finishCommit(commit, committing, outcome);++ expect(tab.txnSessionId).toBe("txn-new");+ expect(tab.txnPossiblyDirty).toBe(true);+ rollback.resolve();+ await rollback.promise;+ // The replacement remains usable by the next caller and by the rollback control.+ await expect(store.ensureManualTransactionSession(id, tab.database, tab.schema)).resolves.toBe("txn-new");+ await store.rollbackTransaction(id);+ expect(mocks.rollbackManualTransaction).toHaveBeenLastCalledWith("txn-new");+ expect(tab.txnSessionId).toBeUndefined();+ expect(tab.txnPossiblyDirty).toBe(false);+ });++ it("cleans up the original session when no replacement was opened", async () => {+ const { store, id, tab } = await setupManualTab(dbType);+ const commit = deferred<void>();+ mocks.commitManualTransaction.mockReturnValueOnce(commit.promise);+ const committing = store.commitTransaction(id);++ await finishCommit(commit, committing, outcome);++ expect(tab.txnSessionId).toBeUndefined();+ expect(tab.txnStatus).toBeUndefined();+ expect(tab.txnPossiblyDirty).toBe(false);+ expect(tab.txnAutoRolledBack).toBe(false);+ expect(tab.autoCommit).toBe(false);+ });++ it("keeps auto-commit mode after the old session was discarded", async () => {+ const { store, id, tab } = await setupManualTab(dbType);+ const commit = deferred<void>();+ mocks.commitManualTransaction.mockReturnValueOnce(commit.promise);+ const committing = store.commitTransaction(id);+ store.setAutoCommit(id, true);++ await finishCommit(commit, committing, outcome);++ expect(tab.autoCommit).toBe(true);+ expect(tab.txnSessionId).toBeUndefined();+ expect(tab.txnPossiblyDirty).toBe(false);+ });++ it("allows a replacement session still opening when the old commit ends", async () => {+ const { store, id, tab } = await setupManualTab(dbType);+ const commit = deferred<void>();+ mocks.commitManualTransaction.mockReturnValueOnce(commit.promise);+ const committing = store.commitTransaction(id);+ store.setAutoCommit(id, true);+ store.setAutoCommit(id, false);+ const begin = deferred<string>();+ mocks.beginManualTransaction.mockReturnValueOnce(begin.promise);+ const starting = store.ensureManualTransactionSession(id, "ORCL", "APP");++ await finishCommit(commit, committing, outcome);+ begin.resolve("txn-new");+ await expect(starting).resolves.toBe("txn-new");+ store.markManualTransactionDirty(id);++ expect(tab.txnSessionId).toBe("txn-new");+ expect(tab.txnPossiblyDirty).toBe(true);+ });++ it("does not affect a new tab after the committing tab closes", async () => {+ const { store, id } = await setupManualTab(dbType);+ const commit = deferred<void>();+ mocks.commitManualTransaction.mockReturnValueOnce(commit.promise);+ const committing = store.commitTransaction(id);+ store.closeTab(id);+ expect(store.tabs.some((tab) => tab.id === id)).toBe(false);+ const newId = store.createTab("conn", "ORCL", "Query", "query", "APP");+ store.setAutoCommit(newId, false);+ mocks.beginManualTransaction.mockResolvedValueOnce("txn-new");+ await store.ensureManualTransactionSession(newId, "ORCL", "APP");+ store.markManualTransactionDirty(newId);++ await finishCommit(commit, committing, outcome);++ const newTab = store.tabs.find((tab) => tab.id === newId)!;+ expect(newTab.txnSessionId).toBe("txn-new");+ expect(newTab.txnPossiblyDirty).toBe(true);+ expect(store.activeTabId).toBe(newId);+ });+ });+});diff --git a/apps/desktop/src/stores/queryStore.ts b/apps/desktop/src/stores/queryStore.tsindex 4e3ebb5c63..b898b5dfb2 100644--- a/apps/desktop/src/stores/queryStore.ts+++ b/apps/desktop/src/stores/queryStore.ts@@ -5404,10 +5404,12 @@ export const useQueryStore = defineStore("query", () => {pendingSqlServerTransactionEnds.set(id, ending);return ending;}+ const sessionId = tab.txnSessionId;try {- await api.commitManualTransaction(tab.txnSessionId);+ await api.commitManualTransaction(sessionId);} finally {- clearManualTransactionSession(tab);+ // A mode or target switch may have started a replacement transaction.+ if (tab.txnSessionId === sessionId) clearManualTransactionSession(tab);}}