fix(export): release db backup snapshot only on terminal state

This commit is contained in:
zipg authored and GitHub committed 2026-08-07 13:44:13 +08:00
1 parent f9e93b356f
commit 7d2a5d3355
8 files changed
+59 -12

No files matched your search

@@ -12,7 +12,7 @@ import * as api from "@/lib/backend/api";
import type { ExportProgress } from "@/lib/backend/api"; import type { ExportProgress } from "@/lib/backend/api";
import { isSchemaAware } from "@/lib/database/databaseFeatureSupport"; import { isSchemaAware } from "@/lib/database/databaseFeatureSupport";
import { databaseOptionsForConnection } from "@/composables/useDatabaseOptions"; import { databaseOptionsForConnection } from "@/composables/useDatabaseOptions";
import { buildAllDatabaseExportPlan, generateDatabaseExportId, runDatabaseExportUntilTerminal, runWithDatabaseBackupSnapshot, type AllDatabaseExportPlanItem } from "@/lib/export/databaseExport"; import { buildAllDatabaseExportPlan, generateDatabaseExportId, runDatabaseExportUntilTerminal, runWithDatabaseBackupSnapshot, shouldUseDatabaseBackupSnapshot, type AllDatabaseExportPlanItem } from "@/lib/export/databaseExport";
import { buildSelectedTablesPayload } from "@/lib/export/databaseExportSelection"; import { buildSelectedTablesPayload } from "@/lib/export/databaseExportSelection";
import { isTauriRuntime } from "@/lib/backend/tauriRuntime"; import { isTauriRuntime } from "@/lib/backend/tauriRuntime";
import { useToast } from "@/composables/useToast"; import { useToast } from "@/composables/useToast";
@@ -304,7 +304,7 @@ async function startExport() {
{ {
connectionId: connectionId.value, connectionId: connectionId.value,
database: database.value, database: database.value,
enabled: includeData.value && (connectionType === "mysql" || connectionType === "postgres"), enabled: shouldUseDatabaseBackupSnapshot(connectionType, includeData.value, isTauriRuntime()),
}, },
async (snapshotSessionId) => { async (snapshotSessionId) => {
const request: api.DatabaseExportRequest = { const request: api.DatabaseExportRequest = {
@@ -323,7 +323,7 @@ async function startExport() {
snapshotSessionId, snapshotSessionId,
batchSize: 1000, batchSize: 1000,
}; };
await api.exportDatabaseSql(request, (progress) => { return runDatabaseExportUntilTerminal(request, (progress) => {
exportProgress.value = { ...progress }; exportProgress.value = { ...progress };
updateDatabaseExportTask(progress.exportId, progress); updateDatabaseExportTask(progress.exportId, progress);
if (progress.status === "Done") { if (progress.status === "Done") {
@@ -342,7 +342,7 @@ async function startExport() {
} }
}); });
}, },
() => !exportError.value && !exportCancelled.value, (terminal) => terminal.status === "Done",
); );
} catch (e: any) { } catch (e: any) {
exportError.value = e?.message || String(e); exportError.value = e?.message || String(e);
@@ -438,7 +438,7 @@ async function startAllDatabasesExport() {
{ {
connectionId: connectionId.value, connectionId: connectionId.value,
database: item.database, database: item.database,
enabled: includeData.value && (connectionType === "mysql" || connectionType === "postgres"), enabled: shouldUseDatabaseBackupSnapshot(connectionType, includeData.value, isTauriRuntime()),
}, },
(snapshotSessionId) => (snapshotSessionId) =>
runDatabaseExportUntilTerminal( runDatabaseExportUntilTerminal(
+1 -1
View File
@@ -2423,7 +2423,7 @@ export default withEnglishFallback({
changeOpenMode: "Modificar modo de apertura", changeOpenMode: "Modificar modo de apertura",
closeRightTabs: "Cerrar pestañas a la derecha", closeRightTabs: "Cerrar pestañas a la derecha",
compileObject: "Compilar", compileObject: "Compilar",
compileObjectSuccess: "\"{name}\" compilado con éxito", compileObjectSuccess: '"{name}" compilado con éxito',
}, },
visibleDatabases: { visibleDatabases: {
title: "Bases de datos visibles", title: "Bases de datos visibles",
+1 -1
View File
@@ -2421,7 +2421,7 @@ export default withEnglishFallback({
changeOpenMode: "Modifica modalità apertura", changeOpenMode: "Modifica modalità apertura",
closeRightTabs: "Chiudi le schede a destra", closeRightTabs: "Chiudi le schede a destra",
compileObject: "Compila", compileObject: "Compila",
compileObjectSuccess: "\"{name}\" compilato con successo", compileObjectSuccess: '"{name}" compilato con successo',
}, },
visibleDatabases: { visibleDatabases: {
title: "Database Visibili", title: "Database Visibili",
+1 -1
View File
@@ -2448,7 +2448,7 @@ export default withEnglishFallback({
changeOpenMode: "開き方を変更", changeOpenMode: "開き方を変更",
closeRightTabs: "右側のタブを閉じる", closeRightTabs: "右側のタブを閉じる",
compileObject: "コンパイル", compileObject: "コンパイル",
compileObjectSuccess: "\"{name}\" のコンパイルに成功しました", compileObjectSuccess: '"{name}" のコンパイルに成功しました',
}, },
visibleDatabases: { visibleDatabases: {
title: "表示するデータベース", title: "表示するデータベース",
+1 -1
View File
@@ -2423,7 +2423,7 @@ export default withEnglishFallback({
changeOpenMode: "Alterar modo de abertura", changeOpenMode: "Alterar modo de abertura",
closeRightTabs: "Fechar abas à direita", closeRightTabs: "Fechar abas à direita",
compileObject: "Compilar", compileObject: "Compilar",
compileObjectSuccess: "\"{name}\" compilado com sucesso", compileObjectSuccess: '"{name}" compilado com sucesso',
}, },
visibleDatabases: { visibleDatabases: {
title: "Bancos de dados visíveis", title: "Bancos de dados visíveis",
+1 -1
View File
@@ -2422,7 +2422,7 @@ export default withEnglishFallback({
changeOpenMode: "修改開啟方式", changeOpenMode: "修改開啟方式",
closeRightTabs: "關閉右側標籤頁", closeRightTabs: "關閉右側標籤頁",
compileObject: "編譯", compileObject: "編譯",
compileObjectSuccess: "\"{name}\" 編譯成功", compileObjectSuccess: '"{name}" 編譯成功',
}, },
visibleDatabases: { visibleDatabases: {
title: "顯示資料庫", title: "顯示資料庫",
@@ -93,6 +93,10 @@ export function generateDatabaseExportId(): string {
return uuid(); return uuid();
} }
export function shouldUseDatabaseBackupSnapshot(databaseType: DatabaseType | undefined, includeData: boolean, desktopRuntime: boolean): boolean {
return desktopRuntime && includeData && (databaseType === "mysql" || databaseType === "postgres");
}
export async function runDatabaseExportUntilTerminal(request: api.DatabaseExportRequest, onProgress: (progress: api.ExportProgress) => void): Promise<api.ExportProgress> { export async function runDatabaseExportUntilTerminal(request: api.DatabaseExportRequest, onProgress: (progress: api.ExportProgress) => void): Promise<api.ExportProgress> {
return new Promise<api.ExportProgress>((resolve, reject) => { return new Promise<api.ExportProgress>((resolve, reject) => {
api api
+45 -2
View File
@@ -1,25 +1,68 @@
import assert from "node:assert/strict"; import assert from "node:assert/strict";
import { readFileSync } from "node:fs";
import { beforeEach, test, vi } from "vitest"; import { beforeEach, test, vi } from "vitest";
const { beginDatabaseBackupSnapshot, rollbackManualTransaction } = vi.hoisted(() => ({ const { beginDatabaseBackupSnapshot, exportDatabaseSql, rollbackManualTransaction } = vi.hoisted(() => ({
beginDatabaseBackupSnapshot: vi.fn(), beginDatabaseBackupSnapshot: vi.fn(),
exportDatabaseSql: vi.fn(),
rollbackManualTransaction: vi.fn(), rollbackManualTransaction: vi.fn(),
})); }));
vi.mock("@/lib/backend/api", () => ({ vi.mock("@/lib/backend/api", () => ({
beginDatabaseBackupSnapshot, beginDatabaseBackupSnapshot,
exportDatabaseSql,
rollbackManualTransaction, rollbackManualTransaction,
})); }));
import { runWithDatabaseBackupSnapshot } from "../../apps/desktop/src/lib/export/databaseExport.ts"; import { runDatabaseExportUntilTerminal, runWithDatabaseBackupSnapshot, shouldUseDatabaseBackupSnapshot } from "../../apps/desktop/src/lib/export/databaseExport.ts";
beforeEach(() => { beforeEach(() => {
beginDatabaseBackupSnapshot.mockReset(); beginDatabaseBackupSnapshot.mockReset();
exportDatabaseSql.mockReset();
rollbackManualTransaction.mockReset(); rollbackManualTransaction.mockReset();
beginDatabaseBackupSnapshot.mockResolvedValue({ sessionId: "snapshot-1" }); beginDatabaseBackupSnapshot.mockResolvedValue({ sessionId: "snapshot-1" });
rollbackManualTransaction.mockResolvedValue({}); rollbackManualTransaction.mockResolvedValue({});
}); });
test("database export snapshots are limited to supported desktop data exports", () => {
assert.equal(shouldUseDatabaseBackupSnapshot("mysql", true, true), true);
assert.equal(shouldUseDatabaseBackupSnapshot("postgres", true, true), true);
assert.equal(shouldUseDatabaseBackupSnapshot("oracle", true, true), false);
assert.equal(shouldUseDatabaseBackupSnapshot("sqlserver", true, true), false);
assert.equal(shouldUseDatabaseBackupSnapshot("mysql", false, true), false);
assert.equal(shouldUseDatabaseBackupSnapshot("postgres", true, false), false);
});
test("database export waits for terminal progress before releasing its snapshot", async () => {
let emitProgress: ((progress: any) => void) | undefined;
exportDatabaseSql.mockImplementation(async (_request, onProgress) => {
emitProgress = onProgress;
});
const operation = runDatabaseExportUntilTerminal({ exportId: "export-1" } as any, () => {});
let settled = false;
void operation.then(() => {
settled = true;
});
await Promise.resolve();
assert.equal(settled, false);
emitProgress?.({ exportId: "export-1", status: "Running" });
await Promise.resolve();
assert.equal(settled, false);
emitProgress?.({ exportId: "export-1", status: "Done" });
assert.equal((await operation).status, "Done");
});
test("single database export holds its snapshot until terminal progress", () => {
const source = readFileSync("apps/desktop/src/components/export/DatabaseExportDialog.vue", "utf8");
const singleExport = source.slice(source.indexOf("async function startExport()"), source.indexOf("async function startAllDatabasesExport()"));
assert.match(singleExport, /return runDatabaseExportUntilTerminal\(request,/);
assert.doesNotMatch(singleExport, /await api\.exportDatabaseSql\(request,/);
});
test("database export snapshot is released after success", async () => { test("database export snapshot is released after success", async () => {
const operation = vi.fn(async (sessionId: string | undefined) => `done:${sessionId}`); const operation = vi.fn(async (sessionId: string | undefined) => `done:${sessionId}`);