diff --git a/Cargo.lock b/Cargo.lock index 1d45dec347..aa86b1a5bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2689,6 +2689,7 @@ version = "0.1.0" dependencies = [ "dbx-core", "tauri", + "tokio", ] [[package]] diff --git a/apps/desktop/src/components/editor/DangerConfirmDialog.vue b/apps/desktop/src/components/editor/DangerConfirmDialog.vue index 064729614a..aa13a1e065 100644 --- a/apps/desktop/src/components/editor/DangerConfirmDialog.vue +++ b/apps/desktop/src/components/editor/DangerConfirmDialog.vue @@ -29,6 +29,7 @@ let focusRestoreGeneration = 0; const props = withDefaults( defineProps<{ sql?: string; + copySql?: string | (() => string); title?: string; message?: string; details?: string; @@ -52,6 +53,7 @@ const props = withDefaults( }>(), { sql: "", + copySql: "", title: "", message: "", details: "", @@ -155,7 +157,8 @@ function onConfirm() { } async function copyFullCode() { - await copyToClipboard(code.value); + const copySql = typeof props.copySql === "function" ? props.copySql() : props.copySql; + await copyToClipboard(copySql || code.value); copied.value = true; window.setTimeout(() => { copied.value = false; diff --git a/apps/desktop/src/components/editor/__tests__/DangerConfirmDialog.spec.ts b/apps/desktop/src/components/editor/__tests__/DangerConfirmDialog.spec.ts index 26d1853f68..9f2066a2ad 100644 --- a/apps/desktop/src/components/editor/__tests__/DangerConfirmDialog.spec.ts +++ b/apps/desktop/src/components/editor/__tests__/DangerConfirmDialog.spec.ts @@ -121,6 +121,21 @@ describe("DangerConfirmDialog SQL preview", () => { expect(copyToClipboard).toHaveBeenCalledWith(sql); }); + it("builds lazy full SQL only when the copy action is used", async () => { + const fullSql = "DELETE FROM orders;\nDELETE FROM customers;"; + const getCopySql = vi.fn(() => fullSql); + + await mountDialog("DELETE FROM orders;", { copySql: getCopySql }); + expect(getCopySql).not.toHaveBeenCalled(); + + const copyButton = Array.from(document.body.querySelectorAll("button")).find((button) => button.title === "Copy full text"); + copyButton?.click(); + await nextTick(); + + expect(getCopySql).toHaveBeenCalledOnce(); + expect(copyToClipboard).toHaveBeenCalledWith(fullSql); + }); + it("restores a previously focused CodeMirror editor through EditorView on close", async () => { const editorRoot = document.createElement("div"); editorRoot.className = "cm-editor"; diff --git a/apps/desktop/src/components/sidebar/ConnectionTree.vue b/apps/desktop/src/components/sidebar/ConnectionTree.vue index 4970f89fcf..03678355dc 100644 --- a/apps/desktop/src/components/sidebar/ConnectionTree.vue +++ b/apps/desktop/src/components/sidebar/ConnectionTree.vue @@ -2921,6 +2921,7 @@ defineExpose({ focusSearch, createNewGroup, collapseAllTreeNodes, locateTabInSid :title="sidebarDangerDialogRequest.title" :message="sidebarDangerDialogRequest.message" :sql="sidebarDangerDialogRequest.sql" + :copy-sql="sidebarDangerDialogRequest.copySql" :details="sidebarDangerDialogRequest.details" :details-text="sidebarDangerDialogRequest.detailsText" :confirm-label="sidebarDangerDialogRequest.confirmLabel" @@ -2933,9 +2934,9 @@ defineExpose({ focusSearch, createNewGroup, collapseAllTreeNodes, locateTabInSid @cancel-running="cancelSidebarDangerDialogRunning" >