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
feat(query): add persistent default database queries
二丫讲梵40c51b605cf9
diff --git a/apps/desktop/src/App.vue b/apps/desktop/src/App.vueindex 5c86861680..f60b9e7b52 100644--- a/apps/desktop/src/App.vue+++ b/apps/desktop/src/App.vue@@ -129,6 +129,7 @@ import {isEditTableStructureShortcut,isExecuteSqlInNewResultTabShortcut,isExecuteSqlShortcut,+ isDefaultQueryShortcutTarget,isFocusSearchShortcut,isFocusWhereShortcut,isGoToColumnShortcut,@@ -143,6 +144,7 @@ import {isRefreshDataShortcut,isSaveShortcut,isSendSelectionToAiShortcut,+ isSidebarFocusedTarget,isSwitchToNextTabShortcut,isSwitchToPreviousTabShortcut,isToggleResultsPaneShortcut,@@ -3144,6 +3146,7 @@ function openConnectionSettings(connectionId: string, initialTab: ConfigTab = "cinterface NewQueryOptions {preferredSource?: NewQueryContextSource;+ openDefault?: boolean;}async function newQuery(options: NewQueryOptions = {}) {@@ -3206,6 +3209,25 @@ async function newQuery(options: NewQueryOptions = {}) {}return;}+ if (options.openDefault) {+ try {+ await connectionStore.ensureConnected(target.connectionId);+ let database = target.database;+ if (target.shouldRefreshDefaultDatabase || !database) {+ const databaseOptions = await getDatabaseOptions(target.connectionId);+ database = resolveDefaultDatabase(conn, databaseOptions);+ }+ await queryStore.openDefaultQuery({ connectionId: target.connectionId, database, catalog: target.catalog });+ } catch (e: any) {+ toast(+ t("connection.connectFailed", {+ message: translateBackendError(t, e),+ }),+ 5000,+ );+ }+ return;+ }// Prefill the editor with `SELECT * FROM <focused table>` when enabled and a// table context (active data/structure tab or selected table node) is available.// Built before createTab so the tab opens with the content directly (no flash).@@ -4519,8 +4541,7 @@ async function handleKeydown(e: KeyboardEvent) {// Otherwise Ctrl+F from empty space in the sidebar incorrectly opens the// search belonging to the active table/query tab.const target = e.target instanceof Element ? e.target : null;- const targetIsDocument = !target || target === document.body || target === document.documentElement;- const sidebarFocused = target?.closest("[data-app-sidebar]") || (targetIsDocument && lastFocusedSidebarSurface.value);+ const sidebarFocused = isSidebarFocusedTarget(target, lastFocusedSidebarSurface.value);const focused = sidebarFocused ? appSidebarRef.value?.focusSearch(target) : focusSearchInAuxiliarySurface(target) || contentAreaRef.value?.focusSearch(target) || appSidebarRef.value?.focusSearch(target);if (focused) {e.preventDefault();@@ -4543,8 +4564,7 @@ async function handleKeydown(e: KeyboardEvent) {e.preventDefault();e.stopPropagation();const target = e.target instanceof Element ? e.target : null;- const targetIsDocument = !target || target === document.body || target === document.documentElement;- const sidebarFocused = target?.closest("[data-app-sidebar]") || (targetIsDocument && lastFocusedSidebarSurface.value);+ const sidebarFocused = isSidebarFocusedTarget(target, lastFocusedSidebarSurface.value);void newQuery({ preferredSource: sidebarFocused ? "sidebar" : undefined });return;}@@ -4638,6 +4658,13 @@ async function handleKeydown(e: KeyboardEvent) {}// CodeMirror ignores keydown events after an IME composition changes the// document, so this app-level fallback must share the editor shortcut guard.+ const defaultQueryShortcutTarget = isDefaultQueryShortcutTarget(e.target, lastFocusedSidebarSurface.value);+ if (isExecuteSqlShortcut(e, shortcuts) && defaultQueryShortcutTarget) {+ e.preventDefault();+ e.stopPropagation();+ void newQuery({ preferredSource: "sidebar", openDefault: true });+ return;+ }if (activeTab.value?.mode === "query" && isExecuteSqlInNewResultTabShortcut(e, shortcuts) && e.target instanceof Element && e.target.closest("[data-query-editor-root]")) {e.preventDefault();e.stopPropagation();@@ -5120,6 +5147,7 @@ onUnmounted(() => {@open-settings="(initialTab) => openSettings(initialTab ?? 'appearance')"@add-to-ai="addToAi"@mousedown="rememberSidebarSearchSurface"+ @focusin="rememberSidebarSearchSurface"/><div@@ -5127,6 +5155,7 @@ onUnmounted(() => {v-show="isSpecialPageActive || (!isAiPanelMaximized && !isHistoryPanelMaximized) || isZenMode":class="isDetachedWindowContext ? 'flex-1 min-w-0 overflow-hidden bg-background' : isClassicLayout ? 'flex-1 min-w-0 overflow-hidden' : 'flex-1 min-w-0 overflow-hidden rounded-md border border-border/80 bg-background'"@mousedown="rememberEditorContentSurface"+ @focusin="rememberEditorContentSurface"><div class="h-full flex min-h-0 min-w-0 flex-col"><AppTabBardiff --git a/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue b/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vueindex 4567832ebd..326e3f8d68 100644--- a/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue+++ b/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue@@ -2134,9 +2134,9 @@ function shouldOpenQueryOnActivation(node: TreeNode): boolean {async function newQuery(options: { reuseQueryTabByScope?: boolean } = {}) {const node = activeNode.value;if (!node.connectionId) return;- // Activation opens (or focuses) "the" query page for the connection scope;+ // Activation opens the persistent default SQL file for this database;// the context-menu entry keeps creating a fresh tab per invocation.- const reuseOptions = options.reuseQueryTabByScope === true ? [{ reuseQueryTabByScope: true }] : [];+ const openDefault = options.reuseQueryTabByScope === true;try {await connectionStore.ensureConnected(node.connectionId);connectionStore.activeConnectionId = node.connectionId;@@ -2159,13 +2159,16 @@ async function newQuery(options: { reuseQueryTabByScope?: boolean } = {}) {openSqlTemplateTab(node.connectionId, node.database, node.schema, node.catalog, sql);return;}- queryStore.createTab(node.connectionId, node.database, undefined, "query", node.schema, undefined, node.catalog, ...reuseOptions);+ if (openDefault) await queryStore.openDefaultQuery({ connectionId: node.connectionId, database: node.database, catalog: node.catalog });+ else queryStore.createTab(node.connectionId, node.database, undefined, "query", node.schema, undefined, node.catalog);return;}const connection = connectionStore.getConfig(node.connectionId);if (!connection) return;const databaseOptions = await getDatabaseOptions(node.connectionId);- queryStore.createTab(node.connectionId, resolveDefaultDatabase(connection, databaseOptions), undefined, "query", connection.default_schema, undefined, undefined, ...reuseOptions);+ const database = resolveDefaultDatabase(connection, databaseOptions);+ if (openDefault) await queryStore.openDefaultQuery({ connectionId: node.connectionId, database });+ else queryStore.createTab(node.connectionId, database, undefined, "query", connection.default_schema);} catch (e: any) {toast(t("connection.connectFailed", { message: translateBackendError(t, e) }), 5000);openDriverStoreForInstallError(e?.message || String(e));@@ -6550,6 +6553,7 @@ function buildConnectionSidebarMenu(context: SidebarMenuFactoryContext): booleanconst supportsAiContext = supportsAiAssistantContext(currentDatabaseType());if (supportsQueryActions) {items.push({ sidebarActionId: "contextMenu.newQuery", label: t("contextMenu.newQuery"), action: newQuery, icon: TerminalSquare });+ items.push({ sidebarActionId: "savedSql.openDefaultQuery", label: t("savedSql.openDefaultQuery"), action: () => newQuery({ reuseQueryTabByScope: true }), icon: TerminalSquare });if (supportsAiContext) {items.push(addToAiMenuItem(node));}@@ -6791,6 +6795,7 @@ function buildDatabaseSidebarMenu(context: SidebarMenuFactoryContext): boolean {items.push({ label: "", separator: true });if (canOpenObjectBrowser.value) items.push({ sidebarActionId: "contextMenu.openObjectBrowser", label: t("contextMenu.openObjectBrowser"), action: openObjectBrowser, icon: TableProperties });items.push({ sidebarActionId: "contextMenu.newQuery", label: t("contextMenu.newQuery"), action: newQuery, icon: TerminalSquare });+ items.push({ sidebarActionId: "savedSql.openDefaultQuery", label: t("savedSql.openDefaultQuery"), action: () => newQuery({ reuseQueryTabByScope: true }), icon: TerminalSquare });if (supportsAiAssistantContext(currentDatabaseType())) items.push(addToAiMenuItem(node));const sqlHistoryMenu = savedSqlHistorySubmenu();if (sqlHistoryMenu) items.push(sqlHistoryMenu);@@ -6813,6 +6818,7 @@ function buildDatabaseSidebarMenu(context: SidebarMenuFactoryContext): boolean {}if (supportsConnectionQueryActions(currentDatabaseType())) {items.push({ sidebarActionId: "contextMenu.newQuery", label: t("contextMenu.newQuery"), action: newQuery, icon: TerminalSquare });+ items.push({ sidebarActionId: "savedSql.openDefaultQuery", label: t("savedSql.openDefaultQuery"), action: () => newQuery({ reuseQueryTabByScope: true }), icon: TerminalSquare });if (node.type === "database" && supportsAiAssistantContext(currentDatabaseType())) {items.push(addToAiMenuItem(node));}@@ -6945,6 +6951,7 @@ function buildSpecialSidebarMenu(context: SidebarMenuFactoryContext): boolean {if (node.type === "saved-sql-root" || node.type === "saved-sql-folder") {if (supportsConnectionQueryActions(currentDatabaseType())) {items.push({ label: t("contextMenu.newQuery"), action: newQuery, icon: TerminalSquare });+ items.push({ label: t("savedSql.openDefaultQuery"), action: () => newQuery({ reuseQueryTabByScope: true }), icon: TerminalSquare });items.push({ label: "", separator: true });}items.push({diff --git a/apps/desktop/src/components/sidebar/TreeItem.vue b/apps/desktop/src/components/sidebar/TreeItem.vueindex 130faf3853..414d54b271 100644--- a/apps/desktop/src/components/sidebar/TreeItem.vue+++ b/apps/desktop/src/components/sidebar/TreeItem.vue@@ -79,7 +79,7 @@ import { findTreeNodeById } from "@/lib/sql/newQueryContext";import { resolveTableVGroupDropTarget, setTableVGroupDropTargetNodeId, tableVGroupDropTargetNodeId } from "@/lib/sidebar/sidebarTableVGroupDrag";import { connectionDisplayUrlScheme } from "@/lib/connection/connectionPresentation";import { redactConnectionStringSecrets } from "@/lib/connection/connectionStringRedaction";-import { isFocusSearchShortcut } from "@/lib/editor/keyboardShortcuts";+import { isExecuteSqlShortcut, isFocusSearchShortcut } from "@/lib/editor/keyboardShortcuts";import { encodeSpannerResourcePath } from "@/lib/connection/spannerResourcePath";import { hexToRgba } from "@/lib/common/color";import { sidebarDisplayTableName } from "@/lib/sidebar/sidebarTableNameDisplay";@@ -1081,6 +1081,10 @@ function onTableSearchControlKeydown(event: KeyboardEvent) {input?.focus();input?.select();}+ // Let the app-level shortcut handler open the database default query while+ // the table-search input remains focused. Other tree-local key handling+ // must stay contained in the search control.+ if (isExecuteSqlShortcut(event, settingsStore.editorSettings.shortcuts)) return;event.stopPropagation();}diff --git a/apps/desktop/src/components/sidebar/__tests__/TreeItem.connectionRename.spec.ts b/apps/desktop/src/components/sidebar/__tests__/TreeItem.connectionRename.spec.tsindex 97a98b5ea9..de92bbbcbb 100644--- a/apps/desktop/src/components/sidebar/__tests__/TreeItem.connectionRename.spec.ts+++ b/apps/desktop/src/components/sidebar/__tests__/TreeItem.connectionRename.spec.ts@@ -237,4 +237,48 @@ describe("TreeItem connection quick rename", () => {expect(host.handleRowKeydown).not.toHaveBeenCalled();expect(setTableSearchQuery).not.toHaveBeenCalled();});++ it("lets Cmd+Enter bubble from the table-search input for the default-query shortcut", async () => {+ const container = document.createElement("div");+ document.body.append(container);+ let bubbledKeydowns = 0;+ container.addEventListener("keydown", () => {+ bubbledKeydowns += 1;+ });+ const host = runtimeHost();+ const runtime = createSidebarTreeRuntime();+ runtime.bindHost(host);+ const setTableSearchQuery = vi.fn();+ const node: TreeNode = {+ id: "connection-1:app:__table_search",+ label: "sidebar.searchTablesInCurrentScope",+ type: "table-search-control",+ connectionId: connection.id,+ database: "app",+ tableSearchParentId: "connection-1:app",+ };+ const app = createApp(+ defineComponent({+ setup: () => () => h(TreeItem, { node, depth: 2 }),+ }),+ );+ app.use(i18n);+ app.provide(sidebarTreeRuntimeKey, runtime);+ app.provide(sidebarTreeContextKey, {+ getVisibleNodes: () => [],+ getVisibleNodeIndex: () => -1,+ setTableSearchQuery,+ });+ app.mount(container);+ mountedApps.push(app);+ await nextTick();++ const input = container.querySelector<HTMLInputElement>("[data-sidebar-table-search-parent-id]");+ expect(input).toBeTruthy();+ input!.dispatchEvent(new KeyboardEvent("keydown", { key: "Enter", metaKey: true, bubbles: true, cancelable: true }));++ expect(bubbledKeydowns).toBe(1);+ expect(host.handleRowKeydown).not.toHaveBeenCalled();+ expect(setTableSearchQuery).not.toHaveBeenCalled();+ });});diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.tsindex 854430cced..e2d5aa90c8 100644--- a/apps/desktop/src/i18n/locales/az.ts+++ b/apps/desktop/src/i18n/locales/az.ts@@ -478,6 +478,7 @@ export default withEnglishFallback({locateActiveTab: "Yan paneldə tap",},savedSql: {+ openDefaultQuery: "Standart sorğunu aç",saveToLibrary: "SQL kitabxanasında yadda saxla",saveToFile: "Yerli yaddaşda saxla",save: "Yadda saxla",diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.tsindex f0605b5219..5e8f9da424 100644--- a/apps/desktop/src/i18n/locales/en.ts+++ b/apps/desktop/src/i18n/locales/en.ts@@ -995,6 +995,7 @@ export default {locateActiveTab: "Locate in sidebar",},savedSql: {+ openDefaultQuery: "Open Default Query",saveToLibrary: "Save to SQL Library",saveToFile: "Save Locally",save: "Save",@@ -9353,7 +9354,7 @@ export default {savedSqlOpenTargetCurrentDescription: "Use the active tab’s connection, database, schema, and catalog when available; otherwise use the saved target.",prefillNewQueryWithSelect: "Prefill new query with SELECT *",openQueryOnConnectionOpen: "Open query page when opening a connection",- openQueryOnConnectionOpenDescription: "When enabled, opening a connection or database defaults to the query page.",+ openQueryOnConnectionOpenDescription: "When enabled, opening a connection or database opens its default.sql query. Changes are saved automatically.",prefillNewQueryWithSelectDescription: "When creating a new query, prefill the editor with SELECT * FROM <table> based on the active table tab or the table selected in the sidebar.",generateSqlIncludeDatabaseName: "Include database name in generated SQL",generateSqlIncludeDatabaseNameDescription: "When supported by the database, generated table SQL uses the qualified name (database.schema.table on SQL Server) instead of only the table name.",diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.tsindex 4c5dd58497..e6fe9624d9 100644--- a/apps/desktop/src/i18n/locales/es.ts+++ b/apps/desktop/src/i18n/locales/es.ts@@ -845,6 +845,7 @@ export default withEnglishFallback({locateActiveTab: "Localizar en la barra lateral",},savedSql: {+ openDefaultQuery: "Abrir consulta predeterminada",saveToLibrary: "Guardar en biblioteca SQL",saveToFile: "Guardar localmente",save: "Guardar",@@ -9152,7 +9153,7 @@ export default withEnglishFallback({sidebarSearchOpenedDatabasesOnlyDescription: "La búsqueda de la barra lateral solo carga las bases de datos abiertas en la conexión actual (si no hay ninguna abierta, busca en todas). Al desactivarla, se buscará en todas las bases de datos de esa conexión.",shortcutSelectLineEnds: "Seleccionar finales de línea",openQueryOnConnectionOpen: "Abrir la página de consulta al abrir la conexión",- openQueryOnConnectionOpenDescription: "Cuando está habilitado, al abrir una conexión o base de datos se accede de forma predeterminada a la página de consulta.",+ openQueryOnConnectionOpenDescription: "Al abrir una conexión o base de datos, abre su consulta default.sql y guarda los cambios automáticamente.",},driverStore: {jreDirRemoveFailed: "No se pudo eliminar el directorio JRE antiguo: {path} (error original: {error})",diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.tsindex 5bcef70cb9..78f86040ec 100644--- a/apps/desktop/src/i18n/locales/id.ts+++ b/apps/desktop/src/i18n/locales/id.ts@@ -679,6 +679,7 @@ export default withEnglishFallback({locateActiveTab: "Cari di bilah sisi",},savedSql: {+ openDefaultQuery: "Buka kueri default",saveToLibrary: "Simpan ke SQL Library",saveToFile: "Simpan Secara Lokal",save: "Simpan",diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.tsindex f8a4c9f908..6152809b4b 100644--- a/apps/desktop/src/i18n/locales/it.ts+++ b/apps/desktop/src/i18n/locales/it.ts@@ -834,6 +834,7 @@ export default withEnglishFallback({locateActiveTab: "Trova nella barra laterale",},savedSql: {+ openDefaultQuery: "Apri query predefinita",saveToLibrary: "Salva nella Libreria SQL",saveToFile: "Salva localmente",save: "Salva",@@ -8899,7 +8900,7 @@ export default withEnglishFallback({sidebarSearchOpenedDatabasesOnlyDescription: "La ricerca nella barra laterale carica solo i database aperti nella connessione corrente (se nessuno è aperto, cerca in tutti). Se disattivata, cerca in tutti i database della connessione.",shortcutSelectLineEnds: "Seleziona fine riga",openQueryOnConnectionOpen: "Apri la pagina Query all'apertura della connessione",- openQueryOnConnectionOpenDescription: "Se abilitato, all'apertura di una connessione o di un database si apre per impostazione predefinita la pagina Query.",+ openQueryOnConnectionOpenDescription: "Apre la query default.sql quando si apre una connessione o un database e salva automaticamente le modifiche.",},driverStore: {jreDirRemoveFailed: "Impossibile rimuovere la vecchia directory JRE: {path} (errore originale: {error})",diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.tsindex 3a62888409..38dfaa67cc 100644--- a/apps/desktop/src/i18n/locales/ja.ts+++ b/apps/desktop/src/i18n/locales/ja.ts@@ -835,6 +835,7 @@ export default withEnglishFallback({locateActiveTab: "サイドバーで表示",},savedSql: {+ openDefaultQuery: "デフォルトクエリを開く",saveToLibrary: "SQLライブラリに保存",saveToFile: "ローカルに保存",save: "保存",@@ -8938,7 +8939,7 @@ export default withEnglishFallback({sidebarSearchOpenedDatabasesOnlyDescription: "サイドバー検索は、現在の接続で開いているデータベースのみを読み込みます(1つも開いていない場合はすべてを検索します)。オフにすると、その接続のすべてのデータベースを検索します。",shortcutSelectLineEnds: "行末を選択",openQueryOnConnectionOpen: "接続を開いたときにクエリページを開く",- openQueryOnConnectionOpenDescription: "有効にすると、接続またはデータベースを開いたときにデフォルトでクエリページが開きます。",+ openQueryOnConnectionOpenDescription: "有効にすると、接続またはデータベースを開いたときに default.sql を開き、変更を自動保存します。",},driverStore: {jreDirRemoveFailed: "古い JRE ディレクトリを削除できませんでした: {path}(元のエラー: {error})",diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.tsindex 681802145b..b2a8777554 100644--- a/apps/desktop/src/i18n/locales/ko.ts+++ b/apps/desktop/src/i18n/locales/ko.ts@@ -836,6 +836,7 @@ export default withEnglishFallback({locateActiveTab: "사이드바에서 찾기",},savedSql: {+ openDefaultQuery: "기본 쿼리 열기",saveToLibrary: "SQL 라이브러리에 저장",saveToFile: "로컬에 저장",save: "저장",@@ -8738,7 +8739,7 @@ export default withEnglishFallback({sidebarSearchOpenedDatabasesOnlyDescription: "사이드바 검색은 현재 연결에서 열려 있는 데이터베이스만 로드합니다(열려 있는 데이터베이스가 하나도 없으면 전체를 검색). 끄면 해당 연결의 모든 데이터베이스를 검색합니다.",shortcutSelectLineEnds: "줄 끝 선택",openQueryOnConnectionOpen: "연결을 열 때 쿼리 페이지로 이동",- openQueryOnConnectionOpenDescription: "활성화하면 연결 또는 데이터베이스를 열 때 기본적으로 쿼리 페이지로 이동합니다.",+ openQueryOnConnectionOpenDescription: "활성화하면 연결 또는 데이터베이스를 열 때 default.sql 쿼리를 열고 변경 사항을 자동 저장합니다.",},driverStore: {jreDirRemoveFailed: "이전 JRE 디렉터리 제거 실패: {path} (원래 오류: {error})",diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.tsindex 0c9f6e6cba..44e55ce687 100644--- a/apps/desktop/src/i18n/locales/pt-BR.ts+++ b/apps/desktop/src/i18n/locales/pt-BR.ts@@ -835,6 +835,7 @@ export default withEnglishFallback({locateActiveTab: "Localizar na barra lateral",},savedSql: {+ openDefaultQuery: "Abrir consulta padrão",saveToLibrary: "Salvar na Biblioteca SQL",saveToFile: "Salvar localmente",save: "Salvar",@@ -8897,7 +8898,7 @@ export default withEnglishFallback({sidebarSearchOpenedDatabasesOnlyDescription: "A pesquisa da barra lateral carrega apenas os bancos de dados abertos na conexão atual (se nenhum estiver aberto, pesquisa todos). Quando desativada, pesquisará todos os bancos de dados da conexão.",shortcutSelectLineEnds: "Selecionar fins de linha",openQueryOnConnectionOpen: "Abrir consulta ao abrir a conexão",- openQueryOnConnectionOpenDescription: "Quando ativado, abre a página de consulta por padrão ao abrir uma conexão ou banco de dados.",+ openQueryOnConnectionOpenDescription: "Ao abrir uma conexão ou banco de dados, abre a consulta default.sql e salva as alterações automaticamente.",},driverStore: {jreDirRemoveFailed: "Não foi possível remover o diretório JRE antigo: {path} (erro original: {error})",diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.tsindex 7c5796e078..f63aef8f9a 100644--- a/apps/desktop/src/i18n/locales/ru.ts+++ b/apps/desktop/src/i18n/locales/ru.ts@@ -815,6 +815,7 @@ export default withEnglishFallback({locateActiveTab: "Найти в боковой панели",},savedSql: {+ openDefaultQuery: "Открыть запрос по умолчанию",saveToLibrary: "Сохранить в библиотеку SQL",saveToFile: "Сохранить локально",save: "Сохранить",@@ -10227,7 +10228,7 @@ export default withEnglishFallback({sidebarSearchOpenedDatabasesOnlyDescription: "Поиск на боковой панели загружает только открытые базы данных в текущем подключении (если ни одна не открыта, поиск выполняется по всем). Если отключить, поиск будет выполняться по всем базам данных этого подключения.",shortcutSelectLineEnds: "Выделить концы строк",openQueryOnConnectionOpen: "Открывать страницу запроса при открытии подключения",- openQueryOnConnectionOpenDescription: "Если включено, при открытии подключения или базы данных по умолчанию открывается страница запроса.",+ openQueryOnConnectionOpenDescription: "При открытии подключения или базы данных открывается запрос default.sql. Изменения сохраняются автоматически.",},driverStore: {jreDirRemoveFailed: "Не удалось удалить старый каталог JRE: {path} (исходная ошибка: {error})",diff --git a/apps/desktop/src/i18n/locales/th.ts b/apps/desktop/src/i18n/locales/th.tsindex 46ecc335de..205edbacbe 100644--- a/apps/desktop/src/i18n/locales/th.ts+++ b/apps/desktop/src/i18n/locales/th.ts@@ -962,6 +962,7 @@ export default withEnglishFallback({locateActiveTab: "ค้นหาในแถบด้านข้าง",},savedSql: {+ openDefaultQuery: "เปิดคำสั่งค้นหาเริ่มต้น",saveToLibrary: "บันทึกไปยังไลบรารี SQL",saveToFile: "บันทึกในเครื่อง",save: "บันทึก",@@ -10001,7 +10002,7 @@ export default withEnglishFallback({savedSqlOpenTargetCurrentDescription: "ใช้การเชื่อมต่อ ฐานข้อมูล Schema และ Catalog ของแท็บที่ใช้งานเมื่อมี มิฉะนั้นใช้เป้าหมายที่บันทึก",prefillNewQueryWithSelect: "เติม Query ใหม่ด้วย SELECT *",openQueryOnConnectionOpen: "เปิดหน้า Query เมื่อเปิดการเชื่อมต่อ",- openQueryOnConnectionOpenDescription: "เมื่อเปิดใช้ การเปิดการเชื่อมต่อหรือฐานข้อมูลจะเปิดหน้าสำหรับ Query โดยค่าเริ่มต้น",+ openQueryOnConnectionOpenDescription: "เมื่อเปิดการเชื่อมต่อหรือฐานข้อมูล จะเปิด default.sql และบันทึกการเปลี่ยนแปลงโดยอัตโนมัติ",prefillNewQueryWithSelectDescription: "เมื่อสร้าง Query ใหม่ ให้เติม SELECT * FROM <table> ตามแท็บตารางที่ใช้งานหรือ ตารางที่เลือกใน Sidebar",generateSqlIncludeDatabaseName: "รวมชื่อฐานข้อมูลใน SQL ที่สร้าง",generateSqlIncludeDatabaseNameDescription: "เมื่อฐานข้อมูลรองรับ SQL ที่สร้างสำหรับตารางจะใช้ชื่อแบบระบุเต็ม (database.schema.table บน SQL Server) แทนการใช้ชื่อตารางอย่างเดียว",diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.tsindex b2cdcd17b7..26988f47a7 100644--- a/apps/desktop/src/i18n/locales/tr.ts+++ b/apps/desktop/src/i18n/locales/tr.ts@@ -478,6 +478,7 @@ export default withEnglishFallback({locateActiveTab: "Kenar çubuğunda bul",},savedSql: {+ openDefaultQuery: "Varsayılan sorguyu aç",saveToLibrary: "SQL Kitaplığına Kaydet",saveToFile: "Yerel Olarak Kaydet",save: "Kaydet",diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.tsindex 5aac192b1a..df57127df1 100644--- a/apps/desktop/src/i18n/locales/zh-CN.ts+++ b/apps/desktop/src/i18n/locales/zh-CN.ts@@ -931,6 +931,7 @@ export default withEnglishFallback({locateActiveTab: "在侧边栏中定位",},savedSql: {+ openDefaultQuery: "打开默认查询",saveToLibrary: "保存到 SQL 库",saveToFile: "保存到本地",save: "保存",@@ -9332,7 +9333,7 @@ export default withEnglishFallback({savedSqlOpenTargetCurrentDescription: "优先使用当前标签页的连接、数据库、Schema 和 Catalog;不可用时回退到保存时的目标。",prefillNewQueryWithSelect: "新建查询时预填充 SELECT 语句",openQueryOnConnectionOpen: "打开连接时进入查询页",- openQueryOnConnectionOpenDescription: "启用后,打开连接或数据库时默认进入查询页面。",+ openQueryOnConnectionOpenDescription: "启用后,打开连接或数据库时进入对应的 default.sql 默认查询,修改自动保存。",prefillNewQueryWithSelectDescription: "新建查询时,根据当前激活的数据表标签页或侧边栏选中的表,自动在编辑器中填充 SELECT * FROM <表名>。",generateSqlIncludeDatabaseName: "生成 SQL 时包含数据库名",generateSqlIncludeDatabaseNameDescription: "数据库支持时,生成的表 SQL 将使用限定名(SQL Server 为“数据库名.schema.表名”),而不只包含表名。",diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.tsindex 028d747c6f..a862b301d6 100644--- a/apps/desktop/src/i18n/locales/zh-TW.ts+++ b/apps/desktop/src/i18n/locales/zh-TW.ts@@ -839,6 +839,7 @@ export default withEnglishFallback({locateActiveTab: "在側邊欄中定位",},savedSql: {+ openDefaultQuery: "開啟預設查詢",saveToLibrary: "儲存到 SQL 庫",saveToFile: "儲存到本機",save: "儲存",@@ -8249,7 +8250,7 @@ export default withEnglishFallback({sidebarSearchOpenedDatabasesOnlyDescription: "側邊欄搜尋只載入目前連線中已開啟的資料庫(若一個都沒開啟則搜尋全部)。關閉後會搜尋該連線的全部資料庫。",shortcutSelectLineEnds: "選取行尾",openQueryOnConnectionOpen: "開啟連線時進入查詢頁",- openQueryOnConnectionOpenDescription: "啟用後,開啟連線或資料庫時預設進入查詢頁面。",+ openQueryOnConnectionOpenDescription: "啟用後,開啟連線或資料庫時進入對應的 default.sql 預設查詢,修改自動儲存。",},driverStore: {jreDirRemoveFailed: "無法刪除舊的 JRE 目錄:{path}(原始錯誤:{error})",diff --git a/apps/desktop/src/lib/__tests__/editor/keyboardShortcuts.spec.ts b/apps/desktop/src/lib/__tests__/editor/keyboardShortcuts.spec.tsindex 73e3bb3750..71ffc433be 100644--- a/apps/desktop/src/lib/__tests__/editor/keyboardShortcuts.spec.ts+++ b/apps/desktop/src/lib/__tests__/editor/keyboardShortcuts.spec.ts@@ -1,3 +1,5 @@+// @vitest-environment happy-dom+import { describe, expect, it } from "vitest";import {eventToModifierOnlyShortcut,@@ -10,6 +12,8 @@ import {isEditSidebarTableStructureShortcut,isEditTableStructureShortcut,isExecuteSqlInNewResultTabShortcut,+ isExecuteSqlShortcut,+ isDefaultQueryShortcutTarget,isGoToColumnShortcut,isFocusWhereShortcut,isGoToFirstPageShortcut,@@ -17,6 +21,7 @@ import {isGoToNextPageShortcut,isGoToPreviousPageShortcut,isToggleZenModeShortcut,+ isSidebarFocusedTarget,isToggleAiPanelShortcut,matchesModifierOnlyShortcut,matchesShortcut,@@ -26,6 +31,32 @@ import { formatShortcutDisplay, isMacShortcutPlatform } from "@/lib/editor/shortimport { shortcutToCodeMirrorKey } from "@/lib/editor/shortcutRegistry";describe("keyboard shortcut matching", () => {+ it("routes Cmd+Enter by focus surface while preserving editor execution", () => {+ const sidebar = document.createElement("div");+ sidebar.dataset.appSidebar = "";+ const row = document.createElement("button");+ sidebar.append(row);+ document.body.append(sidebar);++ expect(isExecuteSqlShortcut({ key: "Enter", metaKey: true }, undefined)).toBe(true);+ expect(isSidebarFocusedTarget(row, false)).toBe(true);+ expect(isSidebarFocusedTarget(document.body, true)).toBe(true);+ const editor = document.createElement("div");+ editor.dataset.queryEditorRoot = "";+ document.body.append(editor);+ expect(isSidebarFocusedTarget(editor, false)).toBe(false);+ expect(isSidebarFocusedTarget(document.createElement("textarea"), false)).toBe(false);+ const objectSearch = document.createElement("input");+ objectSearch.dataset.objectSearchInput = "";+ document.body.append(objectSearch);+ expect(isDefaultQueryShortcutTarget(objectSearch, false)).toBe(true);+ expect(isDefaultQueryShortcutTarget(editor, false)).toBe(false);++ sidebar.remove();+ editor.remove();+ objectSearch.remove();+ });+it("matches configured WHERE focus on macOS and Windows while respecting a cleared binding", () => {expect(isFocusWhereShortcut({ key: "L", metaKey: true, shiftKey: true }, { focusWhere: "Mod+Shift+L" }, "MacIntel")).toBe(true);expect(isFocusWhereShortcut({ key: "L", ctrlKey: true, shiftKey: true }, { focusWhere: "Mod+Shift+L" }, "Win32")).toBe(true);diff --git a/apps/desktop/src/lib/__tests__/sql/newQueryEntryContext.spec.ts b/apps/desktop/src/lib/__tests__/sql/newQueryEntryContext.spec.tsindex d8c7d73caf..dfe75e478a 100644--- a/apps/desktop/src/lib/__tests__/sql/newQueryEntryContext.spec.ts+++ b/apps/desktop/src/lib/__tests__/sql/newQueryEntryContext.spec.ts@@ -60,6 +60,13 @@ describe("new query entry context wiring", () => {expect(body).toContain('sidebarFocused ? "sidebar" : undefined');});+ it("opens the database default query for Cmd+Enter from the sidebar", () => {+ const body = bodyOf("async function handleKeydown");+ expect(body).toContain("isExecuteSqlShortcut(e, shortcuts) && defaultQueryShortcutTarget");+ expect(body).toContain('newQuery({ preferredSource: "sidebar", openDefault: true })');+ expect(bodyOf("async function newQuery")).toContain("queryStore.openDefaultQuery");+ });+it("clears lastFocusedSidebarSurface when editor content is clicked", () => {expect(appSource).toContain("rememberEditorContentSurface");});diff --git a/apps/desktop/src/lib/app/openTabsPersistence.ts b/apps/desktop/src/lib/app/openTabsPersistence.tsindex 7bd59ee6eb..a21d540c69 100644--- a/apps/desktop/src/lib/app/openTabsPersistence.ts+++ b/apps/desktop/src/lib/app/openTabsPersistence.ts@@ -40,6 +40,7 @@ export interface SavedOpenTab {editorSelection?: QueryTab["editorSelection"];originalSql?: string;savedSqlId?: string;+ isDefaultQuery?: boolean;externalSqlPath?: string;externalSqlFileVersion?: QueryTab["externalSqlFileVersion"];externalSqlIgnoredFileVersion?: QueryTab["externalSqlIgnoredFileVersion"];@@ -189,6 +190,7 @@ export function serializeOpenTabs(tabs: QueryTab[]): SavedOpenTab[] {// Clean file-backed tabs omit it so startup can hydrate the current file content....(tab.originalSql !== undefined && ((!tab.savedSqlId && !tab.externalSqlPath) || tab.sql !== tab.originalSql) ? { originalSql: tab.originalSql } : {}),savedSqlId: tab.savedSqlId,+ ...(tab.isDefaultQuery ? { isDefaultQuery: true } : {}),externalSqlPath: tab.externalSqlPath,...(tab.externalSqlFileVersion ? { externalSqlFileVersion: tab.externalSqlFileVersion } : {}),...(tab.externalSqlIgnoredFileVersion ? { externalSqlIgnoredFileVersion: tab.externalSqlIgnoredFileVersion } : {}),diff --git a/apps/desktop/src/lib/backend/api.ts b/apps/desktop/src/lib/backend/api.tsindex 25ad3c7ca1..2e08f3cfc8 100644--- a/apps/desktop/src/lib/backend/api.ts+++ b/apps/desktop/src/lib/backend/api.ts@@ -183,6 +183,7 @@ export const loadSavedSqlFile = forward("loadSavedSqlFile");export const saveSavedSqlFolder = forward("saveSavedSqlFolder");export const deleteSavedSqlFolder = forward("deleteSavedSqlFolder");export const saveSavedSqlFile = forward("saveSavedSqlFile");+export const saveDefaultQueryContent = forward("saveDefaultQueryContent");export const deleteSavedSqlFile = forward("deleteSavedSqlFile");export const savedSqlStorageDir = forward("savedSqlStorageDir");export const openSavedSqlStorageDir = forward("openSavedSqlStorageDir");diff --git a/apps/desktop/src/lib/backend/http.ts b/apps/desktop/src/lib/backend/http.tsindex 40f08f0c7a..252354e0d0 100644--- a/apps/desktop/src/lib/backend/http.ts+++ b/apps/desktop/src/lib/backend/http.ts@@ -1087,6 +1087,10 @@ export async function saveSavedSqlFile(file: SavedSqlFile): Promise<SavedSqlFilereturn post("/api/saved-sql", file);}+export async function saveDefaultQueryContent(id: string, sql: string, updatedAt: string): Promise<void> {+ return post(`/api/saved-sql/${encodeURIComponent(id)}/default-content`, { sql, updatedAt });+}+export async function deleteSavedSqlFile(id: string): Promise<void> {return del(`/api/saved-sql/${encodeURIComponent(id)}`);}diff --git a/apps/desktop/src/lib/backend/tauri.ts b/apps/desktop/src/lib/backend/tauri.tsindex 660937405a..2e08d3e6dd 100644--- a/apps/desktop/src/lib/backend/tauri.ts+++ b/apps/desktop/src/lib/backend/tauri.ts@@ -3261,6 +3261,10 @@ export async function saveSavedSqlFile(file: SavedSqlFile): Promise<SavedSqlFilereturn invoke("save_saved_sql_file", { file });}+export async function saveDefaultQueryContent(id: string, sql: string, updatedAt: string): Promise<void> {+ return invoke("save_default_query_content", { id, sql, updatedAt });+}+export async function deleteSavedSqlFile(id: string): Promise<void> {return invoke("delete_saved_sql_file", { id });}diff --git a/apps/desktop/src/lib/editor/keyboardShortcuts.ts b/apps/desktop/src/lib/editor/keyboardShortcuts.tsindex c43cbda4fa..a9fbbd395d 100644--- a/apps/desktop/src/lib/editor/keyboardShortcuts.ts+++ b/apps/desktop/src/lib/editor/keyboardShortcuts.ts@@ -216,6 +216,19 @@ export function isNewQueryShortcut(event: ShortcutLikeEvent, shortcuts?: Partialreturn matchesShortcut(event, actionShortcut("newQuery", shortcuts));}+/** Whether a global shortcut originated from the sidebar navigation surface. */+export function isSidebarFocusedTarget(target: EventTarget | null, lastFocusedSidebarSurface = false): boolean {+ if (typeof Element !== "undefined" && target instanceof Element && target.closest("[data-app-sidebar]")) return true;+ if (!lastFocusedSidebarSurface || typeof document === "undefined") return false;+ return !target || target === document.body || target === document.documentElement;+}++/** Whether the default-query shortcut is being invoked from navigation/search UI. */+export function isDefaultQueryShortcutTarget(target: EventTarget | null, lastFocusedSidebarSurface = false): boolean {+ if (isSidebarFocusedTarget(target, lastFocusedSidebarSurface)) return true;+ return typeof Element !== "undefined" && target instanceof Element && !!target.closest("[data-object-search-input]");+}+export function isOpenSettingsShortcut(event: ShortcutLikeEvent, shortcuts?: Partial<ShortcutSettings>): boolean {return matchesShortcut(event, actionShortcut("openSettings", shortcuts));}diff --git a/apps/desktop/src/lib/savedSql/savedSqlDatabaseTree.ts b/apps/desktop/src/lib/savedSql/savedSqlDatabaseTree.tsindex 778d8285e1..e57defc2e5 100644--- a/apps/desktop/src/lib/savedSql/savedSqlDatabaseTree.ts+++ b/apps/desktop/src/lib/savedSql/savedSqlDatabaseTree.ts@@ -11,6 +11,7 @@ function savedSqlCopySortKey(name: string): { base: string; copyIndex: number }}function compareSavedSqlFiles(left: SavedSqlFile, right: SavedSqlFile): number {+ if (!!left.isDefaultQuery !== !!right.isDefaultQuery) return left.isDefaultQuery ? -1 : 1;const leftKey = savedSqlCopySortKey(left.name);const rightKey = savedSqlCopySortKey(right.name);return savedSqlNameCollator.compare(leftKey.base, rightKey.base) || leftKey.copyIndex - rightKey.copyIndex || savedSqlNameCollator.compare(left.name, right.name) || left.id.localeCompare(right.id);diff --git a/apps/desktop/src/lib/sidebar/sidebarMenuLayout.ts b/apps/desktop/src/lib/sidebar/sidebarMenuLayout.tsindex 759f9e58fa..7f2d2bc7e2 100644--- a/apps/desktop/src/lib/sidebar/sidebarMenuLayout.ts+++ b/apps/desktop/src/lib/sidebar/sidebarMenuLayout.ts@@ -21,9 +21,9 @@ export function sidebarMenuScope(type: SidebarMenuTargetType): SidebarMenuScope}const primaryActions: Record<SidebarMenuScope, readonly string[]> = {- connection: ["connection.cancelConnecting", "contextMenu.openConnection", "contextMenu.disconnectConnection", "contextMenu.newQuery", "contextMenu.openDatabaseBrowser", "contextMenu.editConnection", "contextMenu.refreshChildren"],- database: ["contextMenu.openObjectBrowser", "contextMenu.newQuery", "contextMenu.createTable", "contextMenu.refreshChildren"],- schema: ["contextMenu.openObjectBrowser", "contextMenu.newQuery", "contextMenu.createTable", "contextMenu.refreshChildren"],+ connection: ["connection.cancelConnecting", "contextMenu.openConnection", "contextMenu.disconnectConnection", "contextMenu.newQuery", "savedSql.openDefaultQuery", "contextMenu.openDatabaseBrowser", "contextMenu.editConnection", "contextMenu.refreshChildren"],+ database: ["contextMenu.openObjectBrowser", "contextMenu.newQuery", "savedSql.openDefaultQuery", "contextMenu.createTable", "contextMenu.refreshChildren"],+ schema: ["contextMenu.openObjectBrowser", "contextMenu.newQuery", "savedSql.openDefaultQuery", "contextMenu.createTable", "contextMenu.refreshChildren"],table: ["contextMenu.viewData", "contextMenu.openInNewDataTab", "contextMenu.editStructure", "contextMenu.newQuery", "contextMenu.refreshChildren"],view: ["contextMenu.viewData", "contextMenu.openInNewDataTab", "contextMenu.editView", "contextMenu.newQuery", "contextMenu.refreshChildren"],"sql-editor": ["editor.execute", "editor.format", "editor.contextMenu.copySelection", "editor.contextMenu.cutSelection", "editor.contextMenu.pasteFromClipboard", "editor.contextMenu.findReplace"],diff --git a/apps/desktop/src/stores/queryStore.ts b/apps/desktop/src/stores/queryStore.tsindex 5c6bc6926e..7d169524d3 100644--- a/apps/desktop/src/stores/queryStore.ts+++ b/apps/desktop/src/stores/queryStore.ts@@ -2762,6 +2762,7 @@ export const useQueryStore = defineStore("query", () => {editorViewport: t.editorViewport,editorSelection: t.editorSelection,savedSqlId: t.savedSqlId,+ isDefaultQuery: t.isDefaultQuery,externalSqlPath: t.externalSqlPath,externalSqlEncoding: t.externalSqlEncoding,externalSqlFileVersion: t.externalSqlFileVersion,@@ -2847,7 +2848,8 @@ export const useQueryStore = defineStore("query", () => {// reflects the latest in-memory tabs without waiting for the 300ms debounce.// Lets callers (e.g. tests that reload the store) read back persisted state// deterministically instead of racing the debounce timer.- function flushPendingPersist(): Promise<void> {+ async function flushPendingPersist(): Promise<void> {+ await flushDefaultQueries();if (isDetachedWindow()) return flushDetachedTabPersistence(activeTabId.value ?? undefined);if (storePersistGeneration !== persistGeneration) return Promise.resolve();if (persistTimer) {@@ -2863,6 +2865,7 @@ export const useQueryStore = defineStore("query", () => {if (tab.mode !== "query" && tab.mode !== "data") throw new Error("Only SQL and data tabs can be detached");if (tab.isExecuting || tab.isCancelling || tab.isExplaining) throw new Error("Wait for the current operation to finish before detaching this tab");+ await flushDefaultQuery(tab);const savedTab = serializeOpenTabs([tab])[0];if (!savedTab) throw new Error("Unable to serialize tab");@@ -4297,6 +4300,78 @@ export const useQueryStore = defineStore("query", () => {return registerOpenTab(tab);}+ const defaultQuerySaveTimers = new Map<string, ReturnType<typeof setTimeout>>();+ const defaultQuerySaves = new Map<string, Promise<void>>();++ function needsDefaultQuerySave(tab: QueryTab): boolean {+ return !!tab.isDefaultQuery && !!tab.savedSqlId && tab.originalSql !== undefined && tab.sql !== tab.originalSql;+ }++ function reportDefaultQuerySaveError(error: unknown) {+ useToast().toast(i18n.global.t("savedSql.saveFailed", { message: savedSqlErrorMessage(error, i18n.global.t) }), 8000);+ }++ function flushDefaultQuery(tab: QueryTab): Promise<void> {+ const timer = defaultQuerySaveTimers.get(tab.id);+ if (timer) clearTimeout(timer);+ defaultQuerySaveTimers.delete(tab.id);+ const pending = defaultQuerySaves.get(tab.id);+ if (pending) return pending;+ if (!needsDefaultQuerySave(tab)) return Promise.resolve();+ const save = (async () => {+ while (tabs.value.includes(tab) && needsDefaultQuerySave(tab)) {+ const fileId = tab.savedSqlId!;+ const sql = tab.sql;+ await useSavedSqlStore().saveDefaultQueryContent(fileId, sql);+ // Only acknowledge the snapshot actually saved, never newer edits.+ if (tab.savedSqlId !== fileId) return;+ tab.originalSql = sql;+ }+ })();+ defaultQuerySaves.set(tab.id, save);+ const cleanup = () => {+ if (defaultQuerySaves.get(tab.id) === save) defaultQuerySaves.delete(tab.id);+ };+ void save.then(cleanup, cleanup);+ return save;+ }++ async function flushDefaultQueries(ids?: readonly string[]): Promise<void> {+ await Promise.all(tabs.value.filter((tab) => tab.isDefaultQuery && (!ids || ids.includes(tab.id))).map(flushDefaultQuery));+ }++ // Watch content rather than only updateSql: formatting, history restoration+ // and clearing the editor can also replace a tab's document directly.+ watch(+ () => tabs.value.filter(needsDefaultQuerySave).map((tab) => ({ id: tab.id, sql: tab.sql })),+ (drafts) => {+ const ids = new Set(drafts.map((draft) => draft.id));+ for (const [id, timer] of defaultQuerySaveTimers) {+ if (!ids.has(id)) {+ clearTimeout(timer);+ defaultQuerySaveTimers.delete(id);+ }+ }+ for (const { id } of drafts) {+ const previous = defaultQuerySaveTimers.get(id);+ if (previous) clearTimeout(previous);+ defaultQuerySaveTimers.set(+ id,+ setTimeout(() => {+ defaultQuerySaveTimers.delete(id);+ const tab = tabs.value.find((item) => item.id === id);+ if (tab) void flushDefaultQuery(tab).catch(reportDefaultQuerySaveError);+ }, 500),+ );+ }+ },+ { deep: true },+ );+ onScopeDispose(() => {+ for (const timer of defaultQuerySaveTimers.values()) clearTimeout(timer);+ defaultQuerySaveTimers.clear();+ });+function isTabDirty(tab: QueryTab): boolean {if (tab.mode === "structure") {// Legacy persisted structure drafts predate the dirty flag; treat them as dirty until the editor rehydrates them.@@ -4312,9 +4387,10 @@ export const useQueryStore = defineStore("query", () => {const hasDirtyTabs = computed(() => tabs.value.some((tab) => isTabDirty(tab)));const shouldConfirmUnsavedSqlClose = computed(() => useSettingsStore().editorSettings.confirmUnsavedSqlClose);const keepUnsavedTabsDraftsOnAppClose = computed(() => useSettingsStore().editorSettings.appCloseUnsavedTabsMode === "keep-drafts");- const requiresAppCloseDraftPersist = computed(() => shouldConfirmUnsavedSqlClose.value && keepUnsavedTabsDraftsOnAppClose.value && tabs.value.some((tab) => tab.mode === "query" && isTabDirty(tab)));+ const requiresAppCloseDraftPersist = computed(() => tabs.value.some((tab) => tab.isDefaultQuery) || (shouldConfirmUnsavedSqlClose.value && keepUnsavedTabsDraftsOnAppClose.value && tabs.value.some((tab) => tab.mode === "query" && isTabDirty(tab))));function shouldConfirmTabOnAppClose(tab: QueryTab): boolean {+ if (tab.isDefaultQuery) return false;if (!shouldConfirmTabClose(tab)) return false;return !keepUnsavedTabsDraftsOnAppClose.value || tab.mode !== "query";}@@ -4530,6 +4606,21 @@ export const useQueryStore = defineStore("query", () => {return;}+ if (+ remainingIds.some((id) => {+ const tab = tabs.value.find((item) => item.id === id);+ return tab && (needsDefaultQuerySave(tab) || defaultQuerySaves.has(id));+ })+ ) {+ void flushDefaultQueries(remainingIds)+ .then(() => continuePendingBatchClose())+ .catch((error) => {+ cancelClosePendingTab();+ reportDefaultQuerySaveError(error);+ });+ return;+ }+const dirtyTab = remainingIds.map((id) => tabs.value.find((tab) => tab.id === id)).find((tab): tab is QueryTab => !!tab && shouldConfirmTabClose(tab));if (dirtyTab) {// Batch close must pause before dropping dirty tabs so the shared save/discard dialog protects every editable surface.@@ -4635,6 +4726,12 @@ export const useQueryStore = defineStore("query", () => {function closeTab(id: string, { force = false, skipHistory = false }: { force?: boolean; skipHistory?: boolean } = {}) {const tab = tabs.value.find((t) => t.id === id);if (!tab) return;+ if (needsDefaultQuerySave(tab) || (tab.isDefaultQuery && defaultQuerySaves.has(id))) {+ void flushDefaultQuery(tab)+ .then(() => closeTab(id, { force, skipHistory }))+ .catch(reportDefaultQuerySaveError);+ return;+ }if (!force && shouldConfirmTabClose(tab)) {showDirtyTabCloseConfirm(tab, "tab");return;@@ -4695,6 +4792,7 @@ export const useQueryStore = defineStore("query", () => {}function shouldConfirmTabClose(tab: QueryTab): boolean {+ if (tab.isDefaultQuery) return false;if (tab.mode === "structure") return isTabDirty(tab);return shouldConfirmUnsavedSqlClose.value && isTabDirty(tab);}@@ -5031,6 +5129,16 @@ export const useQueryStore = defineStore("query", () => {if (!entry) return null;const restoredTab = snapshotClosedTab(entry.tab);+ if (restoredTab.isDefaultQuery) {+ const existing = tabs.value.find((tab) => tab.savedSqlId === restoredTab.savedSqlId);+ if (existing) {+ switchTab(existing.id);+ return existing.id;+ }+ // Reopen the current document, not an old closed-tab SQL snapshot.+ void openDefaultQuery(savedSqlExecutionTargetFromTab(restoredTab)!).catch(reportDefaultQuerySaveError);+ return null;+ }if (tabs.value.some((t) => t.id === restoredTab.id)) {restoredTab.id = uuid();}@@ -5077,6 +5185,12 @@ export const useQueryStore = defineStore("query", () => {if (closingIds.size === 0) return;const closingTabs = tabs.value.filter((tab) => closingIds.has(tab.id));+ if (closingTabs.some((tab) => needsDefaultQuerySave(tab) || (tab.isDefaultQuery && defaultQuerySaves.has(tab.id)))) {+ void flushDefaultQueries([...closingIds])+ .then(() => closeTabsWhere((tab) => closingIds.has(tab.id)))+ .catch(reportDefaultQuerySaveError);+ return;+ }closingTabs.forEach((tab) => {if (tab.mode === "sqlserver-trace") void disposeSqlServerActivityTrace(tab.id);clearDataGridPendingSnapshotsForTab(tab.id);@@ -5421,6 +5535,7 @@ export const useQueryStore = defineStore("query", () => {function updateSql(id: string, sql: string) {const tab = tabs.value.find((t) => t.id === id);if (tab) {+ if (tab.isDefaultQuery && tab.originalSql === undefined) tab.originalSql = "";tab.sql = sql;queueSavedSqlEditorPositionPersist(tab);}@@ -5840,6 +5955,7 @@ export const useQueryStore = defineStore("query", () => {const tab = tabs.value.find((t) => t.id === id);if (!tab) return;tab.savedSqlId = savedSqlId;+ tab.isDefaultQuery = useSavedSqlStore().getFile(savedSqlId)?.isDefaultQuery === true;tab.externalSqlPath = undefined;tab.externalSqlEncoding = undefined;tab.externalSqlFileVersion = undefined;@@ -5860,6 +5976,7 @@ export const useQueryStore = defineStore("query", () => {tab.externalSqlIgnoredFileVersion = undefined;tab.externalSqlFileMissing = undefined;tab.savedSqlId = undefined;+ tab.isDefaultQuery = false;if (title) {tab.title = title;tab.customTitle = true;@@ -5897,16 +6014,22 @@ export const useQueryStore = defineStore("query", () => {return synchronized;}+ async function openDefaultQuery(target: SavedSqlExecutionTarget) {+ const file = await useSavedSqlStore().ensureDefaultQuery({ ...target, schema: undefined });+ return openSavedSql(file);+ }+function openSavedSql(file: SavedSqlFile, options: OpenSavedSqlOptions = {}) {- const targetMode = options.targetMode ?? useSettingsStore().editorSettings.savedSqlOpenTargetMode;+ const targetMode = file.isDefaultQuery ? "saved" : (options.targetMode ?? useSettingsStore().editorSettings.savedSqlOpenTargetMode);const currentTarget = currentSavedSqlExecutionTarget();const resolvedCurrent = targetMode === "current" ? currentTarget : undefined;const effectiveConnectionId = file.connectionId || resolvedCurrent?.connectionId || currentTarget?.connectionId || "";const connection = effectiveConnectionId ? useConnectionStore().getConfig(effectiveConnectionId) : undefined;const fallbackDb = connection ? targetDefaultDatabase(connection) || connection.database : undefined;- const target = resolveSavedSqlExecutionTarget(file, targetMode, resolvedCurrent ?? currentTarget, fallbackDb);+ const target = file.isDefaultQuery ? savedSqlExecutionTargetFromFile(file) : resolveSavedSqlExecutionTarget(file, targetMode, resolvedCurrent ?? currentTarget, fallbackDb);const existing = tabs.value.find((tab) => tab.savedSqlId === file.id);if (existing) {+ existing.isDefaultQuery = file.isDefaultQuery === true;persistSavedSqlEditorPosition(existing);if (!existing.sql && file.sql && existing.originalSql === undefined) {existing.sql = file.sql;@@ -5936,6 +6059,7 @@ export const useQueryStore = defineStore("query", () => {catalog: target.catalog,sql: file.sql,savedSqlId: file.id,+ isDefaultQuery: file.isDefaultQuery === true,originalSql: file.sql,isExecuting: false,isCancelling: false,@@ -5953,6 +6077,11 @@ export const useQueryStore = defineStore("query", () => {await initSavedSqlEditorPositions();const savedSqlStore = useSavedSqlStore();const linkedTabs = tabs.value.filter((tab) => tab.savedSqlId && tab.sql === "" && tab.originalSql === undefined);+ const hasUnindexedSavedSqlTab = tabs.value.some((tab) => tab.savedSqlId && !savedSqlStore.getFile(tab.savedSqlId));+ if (linkedTabs.length > 0 && hasUnindexedSavedSqlTab) await savedSqlStore.initFromStorage();+ for (const tab of tabs.value) {+ if (tab.savedSqlId) tab.isDefaultQuery = savedSqlStore.getFile(tab.savedSqlId)?.isDefaultQuery === true;+ }for (const tab of linkedTabs) {const file = await savedSqlStore.ensureFileContent(tab.savedSqlId!);if (!file) continue;@@ -6022,6 +6151,15 @@ export const useQueryStore = defineStore("query", () => {if (options.persistSavedSqlTarget === false || tab.mode !== "query" || !tab.savedSqlId) return;const savedSqlStore = useSavedSqlStore();const savedSqlId = tab.savedSqlId;+ const file = savedSqlStore.getFile(savedSqlId);+ if (file?.isDefaultQuery && (file.connectionId !== tab.connectionId || file.database !== tab.database || (file.catalog || "") !== (tab.catalog || ""))) {+ const target = savedSqlExecutionTargetFromTab(tab)!;+ applySavedSqlExecutionTarget(tab, savedSqlExecutionTargetFromFile(file));+ void flushDefaultQuery(tab)+ .then(() => openDefaultQuery(target))+ .catch(reportDefaultQuerySaveError);+ return;+ }void savedSqlStore.updateFileExecutionTarget(savedSqlId, {connectionId: tab.connectionId,@@ -10425,6 +10563,8 @@ export const useQueryStore = defineStore("query", () => {linkExternalSqlPath,openExternalSqlFile,openSavedSql,+ openDefaultQuery,+ flushDefaultQueries,hydrateSavedSqlTabs,syncSavedSqlExecutionTargets,togglePinnedTab,diff --git a/apps/desktop/src/stores/savedSqlStore.ts b/apps/desktop/src/stores/savedSqlStore.tsindex e406ae1fe2..529ad85cb1 100644--- a/apps/desktop/src/stores/savedSqlStore.ts+++ b/apps/desktop/src/stores/savedSqlStore.ts@@ -20,6 +20,7 @@ interface SavedSqlState {}interface SaveFileInput {+ isDefaultQuery?: boolean;id?: string;connectionId: string;folderId?: string;@@ -250,7 +251,7 @@ export const useSavedSqlStore = defineStore("savedSql", () => {await api.saveSavedSqlFolder(folder);}for (const file of legacy.files) {- await api.saveSavedSqlFile(file);+ await persistFile(file);}localStorage.removeItem(LEGACY_STORAGE_KEY);}@@ -296,6 +297,115 @@ export const useSavedSqlStore = defineStore("savedSql", () => {return files.value.find((file) => file.id === id);}+ // Serialize content and metadata writes for a file, including deletion. A+ // rename/usage update must never write an older SQL snapshot over autosave.+ const fileWrites = new Map<string, Promise<unknown>>();+ const deletingFiles = new Set<string>();+ function enqueueFileWrite<T>(id: string, write: () => Promise<T>): Promise<T> {+ const pending = (fileWrites.get(id) ?? Promise.resolve()).catch(() => undefined).then(write);+ fileWrites.set(id, pending);+ const cleanup = () => {+ if (fileWrites.get(id) === pending) fileWrites.delete(id);+ };+ void pending.then(cleanup, cleanup);+ return pending;+ }++ function persistFile(file: SavedSqlFile, mode: "all" | "metadata" | "content" = "all"): Promise<SavedSqlFile> {+ return enqueueFileWrite(file.id, async () => {+ if (deletingFiles.has(file.id)) throw new Error("SQL file is being deleted");+ const current = getFile(file.id);+ if (mode === "content" && (!current || !current.isDefaultQuery)) throw new Error("Default query no longer exists");+ if (mode === "content") {+ await api.saveDefaultQueryContent(file.id, file.sql, file.updatedAt);+ return { ...current!, sql: file.sql, sqlLoaded: true, updatedAt: file.updatedAt };+ }+ const candidate = mode === "metadata" ? { ...file, sqlLoaded: false } : file;+ const saved = normalizeSavedSqlFile(await api.saveSavedSqlFile(candidate));+ if (mode === "metadata") return { ...saved, sql: current?.sql ?? file.sql, sqlLoaded: current?.sqlLoaded ?? file.sqlLoaded };+ return saved;+ });+ }++ const defaultQueryCreates = new Map<string, Promise<SavedSqlFile>>();++ function getDefaultQuery(scope: SavedSqlExecutionTargetInput) {+ const key = savedSqlDatabaseScopeKey(scope);+ return files.value.find((file) => file.isDefaultQuery && savedSqlDatabaseScopeKey(file) === key);+ }++ async function ensureDefaultQuery(scope: SavedSqlExecutionTargetInput): Promise<SavedSqlFile> {+ await initFromStorage();+ // The default query is database-scoped. A schema selected in the sidebar+ // must not become sticky state for the shared database default.+ const defaultScope = { ...scope, schema: undefined };+ const key = savedSqlDatabaseScopeKey(defaultScope);+ const pending = defaultQueryCreates.get(key);+ if (pending) return pending;+ const create = (async () => {+ const existing = getDefaultQuery(defaultScope);+ if (existing) {+ const loaded = await api.loadSavedSqlFile(existing.id);+ if (loaded) {+ const normalized = normalizeSavedSqlFile(loaded);+ const file =+ normalized.schema === undefined+ ? { ...normalized, sqlLoaded: true }+ : await saveFile({+ id: normalized.id,+ isDefaultQuery: true,+ connectionId: normalized.connectionId,+ folderId: normalized.folderId,+ name: normalized.name,+ database: normalized.database,+ catalog: normalized.catalog,+ schema: undefined,+ sql: normalized.sql,+ });+ files.value = files.value.map((item) => (item.id === file.id ? file : item));+ bumpVersion({ tree: true });+ return file;+ }+ files.value = files.value.filter((file) => file.id !== existing.id);+ }+ try {+ return await saveFile({+ ...defaultScope,+ folderId: undefined,+ name: nextAvailableSqlName("default.sql", takenFileNames({ ...defaultScope, folderId: undefined })),+ sql: "",+ isDefaultQuery: true,+ });+ } catch (error) {+ // The unique scope constraint also protects creation from another window.+ const library = await api.loadSavedSqlLibrary();+ const winner = library.files.find((file) => file.isDefaultQuery && savedSqlDatabaseScopeKey(file) === key);+ if (!winner) throw error;+ files.value = [...files.value.filter((file) => file.id !== winner.id), normalizeSavedSqlFile(winner)];+ bumpVersion({ tree: true });+ const loaded = await ensureFileContent(winner.id);+ if (!loaded) throw error;+ return loaded;+ }+ })();+ defaultQueryCreates.set(key, create);+ try {+ return await create;+ } finally {+ if (defaultQueryCreates.get(key) === create) defaultQueryCreates.delete(key);+ }+ }++ async function saveDefaultQueryContent(id: string, sql: string): Promise<void> {+ await initFromStorage();+ const file = getFile(id);+ if (!file?.isDefaultQuery) throw new Error("Default query no longer exists");+ const saved = await persistFile({ ...file, sql, updatedAt: nowIso() }, "content");+ files.value = files.value.map((item) => (item.id === id ? { ...item, sql: saved.sql, sqlLoaded: true, updatedAt: saved.updatedAt } : item));+ bumpVersion();+ await syncToLocalDirectory();+ }+function reserveFileName(file: SavedSqlNameScope, options: { allowExisting?: boolean } = {}): () => void {const scopeKey = savedSqlNameScopeKey(file);const nameKey = savedSqlNameKey(file.name);@@ -407,8 +517,24 @@ export const useSavedSqlStore = defineStore("savedSql", () => {async function deleteFolder(id: string) {const removedIds = descendantFolderIds(id);- const removesFiles = files.value.some((file) => !!file.folderId && removedIds.has(file.folderId));- await api.deleteSavedSqlFolder(id);+ const removedFiles = files.value.filter((file) => !!file.folderId && removedIds.has(file.folderId));+ const removesFiles = removedFiles.length > 0;+ for (const file of removedFiles) deletingFiles.add(file.id);+ await Promise.allSettled(removedFiles.map((file) => fileWrites.get(file.id)));+ try {+ await api.deleteSavedSqlFolder(id);+ } catch (error) {+ for (const file of removedFiles) deletingFiles.delete(file.id);+ throw error;+ }+ const { useQueryStore } = await import("@/stores/queryStore");+ const queryStore = useQueryStore();+ for (const tab of queryStore.tabs) {+ if (removedFiles.some((file) => file.id === tab.savedSqlId) && tab.isDefaultQuery) {+ tab.isDefaultQuery = false;+ queryStore.closeTab(tab.id, { force: true });+ }+ }folders.value = folders.value.filter((folder) => !removedIds.has(folder.id));files.value = files.value.filter((file) => !file.folderId || !removedIds.has(file.folderId));bumpVersion({ tree: removesFiles });@@ -437,6 +563,7 @@ export const useSavedSqlStore = defineStore("savedSql", () => {}: {id: uuid(),+ isDefaultQuery: input.isDefaultQuery === true,connectionId: input.connectionId,catalog,folderId: input.folderId || undefined,@@ -452,7 +579,7 @@ export const useSavedSqlStore = defineStore("savedSql", () => {const nameIdentityChanged = !existing || savedSqlNameIdentity(existing) !== savedSqlNameIdentity(file);const releaseName = nameIdentityChanged ? reserveFileName(file) : undefined;try {- const saved = normalizeSavedSqlFile(await api.saveSavedSqlFile(file));+ const saved = normalizeSavedSqlFile(await persistFile(file));files.value = [...files.value.filter((item) => item.id !== saved.id), { ...saved, sqlLoaded: true }];bumpVersion({ tree: !existing || savedSqlTreeIdentity(existing) !== savedSqlTreeIdentity(saved) });await syncToLocalDirectory();@@ -481,6 +608,9 @@ export const useSavedSqlStore = defineStore("savedSql", () => {const existing = getFile(id);if (!existing) return Promise.resolve(undefined);const normalizedTarget = { ...target, catalog: normalizedCatalog(target.catalog) };+ if (existing.isDefaultQuery && savedSqlDatabaseScopeKey(existing) !== savedSqlDatabaseScopeKey(normalizedTarget)) {+ return copyFilesToDatabase([id], normalizedTarget).then((copies) => copies[0]);+ }const folderId = options.updateFolder ? options.folderId || undefined : existing.folderId;const orderIndex = options.updateFolder ? options.orderIndex : existing.orderIndex;if (@@ -534,7 +664,7 @@ export const useSavedSqlStore = defineStore("savedSql", () => {}): savedSqlNameIdentity(candidate);if (persistedNameIdentity !== savedSqlNameIdentity(candidate)) releaseName = reserveFileName(candidate);- const saved = normalizeSavedSqlFile(await api.saveSavedSqlFile(candidate));+ const saved = normalizeSavedSqlFile(await persistFile(candidate, "metadata"));setPersistedFileTarget(saved);if (fileTargetRevisions.get(id) !== revision) return getFile(id);const latest = getFile(id);@@ -637,7 +767,7 @@ export const useSavedSqlStore = defineStore("savedSql", () => {const candidate = { ...existing, name: normalizedName, updatedAt: nowIso() };const releaseName = reserveFileName(candidate);try {- const saved = normalizeSavedSqlFile(await api.saveSavedSqlFile(candidate));+ const saved = normalizeSavedSqlFile(await persistFile(candidate, "metadata"));files.value = files.value.map((file) => (file.id === id ? { ...saved, sql: file.sql, sqlLoaded: file.sqlLoaded } : file));bumpVersion({ tree: true });@@ -690,11 +820,14 @@ export const useSavedSqlStore = defineStore("savedSql", () => {const existing = getFile(id);if (!existing) return;try {- const saved = await api.saveSavedSqlFile({- ...existing,- openCount: (existing.openCount ?? 0) + 1,- openedAt: nowIso(),- });+ const saved = await persistFile(+ {+ ...existing,+ openCount: (existing.openCount ?? 0) + 1,+ openedAt: nowIso(),+ },+ "metadata",+ );files.value = files.value.map((file) => (file.id === id ? { ...saved, sql: file.sql, sqlLoaded: file.sqlLoaded } : file));bumpVersion();return saved;@@ -705,19 +838,26 @@ export const useSavedSqlStore = defineStore("savedSql", () => {}async function deleteFile(id: string) {- await api.deleteSavedSqlFile(id);+ deletingFiles.add(id);+ try {+ await enqueueFileWrite(id, () => api.deleteSavedSqlFile(id));+ } catch (error) {+ deletingFiles.delete(id);+ throw error;+ }files.value = files.value.filter((file) => file.id !== id);bumpVersion({ tree: true });- await syncToLocalDirectory();// Close all tabs that reference this saved SQL fileconst { useQueryStore } = await import("@/stores/queryStore");const queryStore = useQueryStore();const tabsToClose = queryStore.tabs.filter((tab) => tab.savedSqlId === id);for (const tab of tabsToClose) {+ tab.isDefaultQuery = false;queryStore.closeTab(tab.id, { force: true });}forgetSavedSqlEditorPosition(id);+ await syncToLocalDirectory();}async function persistFolders(nextFolders: SavedSqlFolder[]) {@@ -736,7 +876,7 @@ export const useSavedSqlStore = defineStore("savedSql", () => {for (const file of nextFiles) {if (previousNameIdentities.get(file.id) !== savedSqlNameIdentity(file)) releaseNames.push(reserveFileName(file));}- const savedFiles = await Promise.all(nextFiles.map((file) => api.saveSavedSqlFile(file)));+ const savedFiles = await Promise.all(nextFiles.map((file) => persistFile(file, "metadata")));files.value = savedFiles.map((saved) => {const existing = files.value.find((file) => file.id === saved.id);return { ...normalizeSavedSqlFile(saved), sql: existing?.sql ?? saved.sql, sqlLoaded: existing?.sqlLoaded ?? saved.sqlLoaded };@@ -1053,6 +1193,9 @@ export const useSavedSqlStore = defineStore("savedSql", () => {listChildFolders,listFiles,getFile,+ getDefaultQuery,+ ensureDefaultQuery,+ saveDefaultQueryContent,ensureFileContent,ensureAllFilesLoaded,createFolder,diff --git a/apps/desktop/src/types/database.ts b/apps/desktop/src/types/database.tsindex cc4c6be61b..cb6b788fda 100644--- a/apps/desktop/src/types/database.ts+++ b/apps/desktop/src/types/database.ts@@ -2048,6 +2048,7 @@ export interface DatabaseSearchTabState {}export interface QueryTab {+ isDefaultQuery?: boolean;id: string;/** Stable creation time used when tabs are displayed in creation order. */createdAt?: number;@@ -2481,6 +2482,8 @@ export interface SavedSqlFolder {}export interface SavedSqlFile {+ /** The persistent, autosaved query for this connection/catalog/database. */+ isDefaultQuery?: boolean;id: string;connectionId: string;folderId?: string;diff --git a/crates/dbx-core/src/persistence/saved_sql.rs b/crates/dbx-core/src/persistence/saved_sql.rsindex 057b381f2d..aea9377c5c 100644--- a/crates/dbx-core/src/persistence/saved_sql.rs+++ b/crates/dbx-core/src/persistence/saved_sql.rs@@ -20,6 +20,8 @@ pub struct SavedSqlFolder {#[derive(Debug, Clone, Serialize, Deserialize)]#[serde(rename_all = "camelCase")]pub struct SavedSqlFile {+ #[serde(default)]+ pub is_default_query: bool,pub id: String,pub connection_id: String,pub folder_id: Option<String>,diff --git a/crates/dbx-core/src/persistence/storage.rs b/crates/dbx-core/src/persistence/storage.rsindex 38c87f9aab..3e305a6f18 100644--- a/crates/dbx-core/src/persistence/storage.rs+++ b/crates/dbx-core/src/persistence/storage.rs@@ -1245,6 +1245,7 @@ const SCHEMA_STATEMENTS: &[&str] = &[updated_at TEXT NOT NULL DEFAULT '')","CREATE TABLE IF NOT EXISTS saved_sql_files (+ is_default_query INTEGER NOT NULL DEFAULT 0,id TEXT PRIMARY KEY,connection_id TEXT NOT NULL,folder_id TEXT,@@ -3185,6 +3186,7 @@ fn ensure_saved_sql_columns_sync(conn: &Connection) -> Result<(), String> {const FOLDER_COLUMNS: &[(&str, &str)] =&[("parent_folder_id", "TEXT"), ("order_index", "INTEGER NOT NULL DEFAULT 0")];const FILE_COLUMNS: &[(&str, &str)] = &[+ ("is_default_query", "INTEGER NOT NULL DEFAULT 0"),("catalog_name", "TEXT"),("order_index", "INTEGER NOT NULL DEFAULT 0"),("open_count", "INTEGER NOT NULL DEFAULT 0"),@@ -3193,6 +3195,12 @@ fn ensure_saved_sql_columns_sync(conn: &Connection) -> Result<(), String> {ensure_table_columns(conn, "saved_sql_folders", FOLDER_COLUMNS)?;ensure_table_columns(conn, "saved_sql_files", FILE_COLUMNS)?;+ conn.execute_batch(+ "CREATE UNIQUE INDEX IF NOT EXISTS idx_saved_sql_default_scope+ ON saved_sql_files(connection_id, COALESCE(catalog_name, ''), database_name)+ WHERE is_default_query = 1;",+ )+ .map_err(|e| e.to_string())?;Ok(())}@@ -7810,8 +7818,8 @@ impl Storage {for file in &library.files {tx.execute("INSERT INTO saved_sql_files \- (id, connection_id, folder_id, name, database_name, catalog_name, schema_name, sql_text, order_index, open_count, opened_at, created_at, updated_at) \- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",+ (id, connection_id, folder_id, name, database_name, catalog_name, schema_name, sql_text, order_index, open_count, opened_at, created_at, updated_at, is_default_query) \+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",params![file.id,file.connection_id,@@ -7825,7 +7833,8 @@ impl Storage {file.open_count,file.opened_at,file.created_at,- file.updated_at+ file.updated_at,+ file.is_default_query],).map_err(|e| e.to_string())?;@@ -7862,7 +7871,7 @@ impl Storage {let mut file_stmt = conn.prepare(- "SELECT id, connection_id, folder_id, name, database_name, catalog_name, schema_name, sql_text, order_index, open_count, opened_at, created_at, updated_at \+ "SELECT id, connection_id, folder_id, name, database_name, catalog_name, schema_name, sql_text, order_index, open_count, opened_at, created_at, updated_at, is_default_query \FROM saved_sql_files ORDER BY COALESCE(folder_id, ''), order_index, connection_id, name COLLATE NOCASE",).map_err(|e| e.to_string())?;@@ -7883,6 +7892,7 @@ impl Storage {opened_at: row.get(10)?,created_at: row.get(11)?,updated_at: row.get(12)?,+ is_default_query: row.get(13)?,})}).map_err(|e| e.to_string())?@@ -7898,7 +7908,7 @@ impl Storage {self.with_conn(|conn| {let mut stmt = conn.prepare(- "SELECT id, connection_id, folder_id, name, database_name, catalog_name, schema_name, sql_text, order_index, open_count, opened_at, created_at, updated_at \+ "SELECT id, connection_id, folder_id, name, database_name, catalog_name, schema_name, sql_text, order_index, open_count, opened_at, created_at, updated_at, is_default_query \FROM saved_sql_files ORDER BY COALESCE(folder_id, ''), order_index, connection_id, name COLLATE NOCASE",).map_err(|e| e.to_string())?;@@ -7919,6 +7929,7 @@ impl Storage {opened_at: row.get(10)?,created_at: row.get(11)?,updated_at: row.get(12)?,+ is_default_query: row.get(13)?,})}).map_err(|e| e.to_string())?@@ -7955,7 +7966,7 @@ impl Storage {let mut file_stmt = conn.prepare(- "SELECT id, connection_id, folder_id, name, database_name, catalog_name, schema_name, order_index, open_count, opened_at, created_at, updated_at \+ "SELECT id, connection_id, folder_id, name, database_name, catalog_name, schema_name, order_index, open_count, opened_at, created_at, updated_at, is_default_query \FROM saved_sql_files ORDER BY COALESCE(folder_id, ''), order_index, connection_id, name COLLATE NOCASE",).map_err(|e| e.to_string())?;@@ -7976,6 +7987,7 @@ impl Storage {opened_at: row.get(9)?,created_at: row.get(10)?,updated_at: row.get(11)?,+ is_default_query: row.get(12)?,})}).map_err(|e| e.to_string())?@@ -7992,7 +8004,7 @@ impl Storage {self.with_conn(move |conn| {let mut stmt = conn.prepare(- "SELECT id, connection_id, folder_id, name, database_name, catalog_name, schema_name, sql_text, order_index, open_count, opened_at, created_at, updated_at \+ "SELECT id, connection_id, folder_id, name, database_name, catalog_name, schema_name, sql_text, order_index, open_count, opened_at, created_at, updated_at, is_default_query \FROM saved_sql_files WHERE id = ?1",).map_err(|e| e.to_string())?;@@ -8012,6 +8024,7 @@ impl Storage {opened_at: row.get(10)?,created_at: row.get(11)?,updated_at: row.get(12)?,+ is_default_query: row.get(13)?,})}) {Ok(file) => Ok(Some(file)),@@ -8085,8 +8098,8 @@ impl Storage {self.with_conn(move |conn| {conn.execute("INSERT INTO saved_sql_files \- (id, connection_id, folder_id, name, database_name, catalog_name, schema_name, sql_text, order_index, open_count, opened_at, created_at, updated_at) \- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) \+ (id, connection_id, folder_id, name, database_name, catalog_name, schema_name, sql_text, order_index, open_count, opened_at, created_at, updated_at, is_default_query) \+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) \ON CONFLICT(id) DO UPDATE SET \connection_id = excluded.connection_id, \folder_id = excluded.folder_id, \@@ -8094,11 +8107,12 @@ impl Storage {database_name = excluded.database_name, \catalog_name = excluded.catalog_name, \schema_name = excluded.schema_name, \- sql_text = CASE WHEN ?14 THEN excluded.sql_text ELSE saved_sql_files.sql_text END, \+ sql_text = CASE WHEN ?15 THEN excluded.sql_text ELSE saved_sql_files.sql_text END, \order_index = excluded.order_index, \open_count = excluded.open_count, \opened_at = excluded.opened_at, \- updated_at = excluded.updated_at",+ updated_at = excluded.updated_at, \+ is_default_query = excluded.is_default_query",params![file.id,file.connection_id,@@ -8113,6 +8127,7 @@ impl Storage {file.opened_at,file.created_at,file.updated_at,+ file.is_default_query,file.sql_loaded],)@@ -8122,6 +8137,25 @@ impl Storage {.await}+ /// Autosave only the document body: concurrent metadata writes must not be+ /// overwritten, and a deleted default query must never be recreated here.+ pub async fn save_default_query_content(&self, id: &str, sql: &str, updated_at: &str) -> Result<(), String> {+ let (id, sql, updated_at) = (id.to_string(), sql.to_string(), updated_at.to_string());+ self.with_conn(move |conn| {+ let changed = conn+ .execute(+ "UPDATE saved_sql_files SET sql_text = ?2, updated_at = ?3 WHERE id = ?1 AND is_default_query = 1",+ params![id, sql, updated_at],+ )+ .map_err(|e| e.to_string())?;+ if changed == 0 {+ return Err("Default query no longer exists".to_string());+ }+ Ok(())+ })+ .await+ }+pub async fn delete_saved_sql_file(&self, id: &str) -> Result<(), String> {let id = id.to_string();self.with_conn(move |conn| {@@ -9464,8 +9498,8 @@ fn apply_saved_sql_in_tx(tx: &Transaction<'_>, library: &SavedSqlLibrary, merge_}for file in &library.files {tx.execute(- "INSERT OR REPLACE INTO saved_sql_files (id, connection_id, folder_id, name, database_name, catalog_name, schema_name, sql_text, order_index, open_count, opened_at, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",- params![file.id, file.connection_id, file.folder_id, file.name, file.database, file.catalog, file.schema, file.sql, file.order_index, file.open_count, file.opened_at, file.created_at, file.updated_at],+ "INSERT INTO saved_sql_files (id, connection_id, folder_id, name, database_name, catalog_name, schema_name, sql_text, order_index, open_count, opened_at, created_at, updated_at, is_default_query) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET connection_id=excluded.connection_id, folder_id=excluded.folder_id, name=excluded.name, database_name=excluded.database_name, catalog_name=excluded.catalog_name, schema_name=excluded.schema_name, sql_text=excluded.sql_text, order_index=excluded.order_index, open_count=excluded.open_count, opened_at=excluded.opened_at, created_at=excluded.created_at, updated_at=excluded.updated_at, is_default_query=excluded.is_default_query",+ params![file.id, file.connection_id, file.folder_id, file.name, file.database, file.catalog, file.schema, file.sql, file.order_index, file.open_count, file.opened_at, file.created_at, file.updated_at, file.is_default_query],).map_err(|e| e.to_string())?;}@@ -13924,6 +13958,7 @@ mod tests {let path = temp_db_path("saved-sql-summary");let storage = crate::persistence::test_storage::open(&path).await.unwrap();let file = SavedSqlFile {+ is_default_query: false,id: "sql-1".to_string(),connection_id: "conn-1".to_string(),folder_id: None,@@ -13965,6 +14000,7 @@ mod tests {let path = temp_db_path("saved-sql-preserve-unloaded-text");let storage = crate::persistence::test_storage::open(&path).await.unwrap();let mut file = SavedSqlFile {+ is_default_query: false,id: "sql-1".to_string(),connection_id: "conn-1".to_string(),folder_id: None,@@ -14033,6 +14069,7 @@ mod tests {assert_eq!(legacy.catalog, None);let external = SavedSqlFile {+ is_default_query: false,id: "external".to_string(),connection_id: "conn-1".to_string(),catalog: Some("iceberg_catalog".to_string()),diff --git a/crates/dbx-web/src/main.rs b/crates/dbx-web/src/main.rsindex 49f77fedb4..8c4518054b 100644--- a/crates/dbx-web/src/main.rs+++ b/crates/dbx-web/src/main.rs@@ -1344,6 +1344,7 @@ async fn serve() -> Result<(), String> {"/saved-sql/{id}",get(routes::saved_sql::load_saved_sql_file).delete(routes::saved_sql::delete_saved_sql_file),)+ .route("/saved-sql/{id}/default-content", post(routes::saved_sql::save_default_query_content)).route("/saved-sql/folders", post(routes::saved_sql::save_saved_sql_folder)).route("/saved-sql/folders/{id}", delete(routes::saved_sql::delete_saved_sql_folder))// AIdiff --git a/crates/dbx-web/src/routes/saved_sql.rs b/crates/dbx-web/src/routes/saved_sql.rsindex 62d72742ec..82bfd0c7c6 100644--- a/crates/dbx-web/src/routes/saved_sql.rs+++ b/crates/dbx-web/src/routes/saved_sql.rs@@ -51,3 +51,24 @@ pub async fn delete_saved_sql_file(state.app.storage.delete_saved_sql_file(&id).await.map_err(AppError::from)?;Ok(Json(()))}++#[derive(serde::Deserialize)]+#[serde(rename_all = "camelCase")]+pub struct DefaultQueryContent {+ sql: String,+ updated_at: String,+}++pub async fn save_default_query_content(+ State(state): State<Arc<WebState>>,+ Path(id): Path<String>,+ Json(content): Json<DefaultQueryContent>,+) -> Result<Json<()>, AppError> {+ state+ .app+ .storage+ .save_default_query_content(&id, &content.sql, &content.updated_at)+ .await+ .map_err(AppError::from)?;+ Ok(Json(()))+}diff --git a/src-tauri/src/commands/saved_sql.rs b/src-tauri/src/commands/saved_sql.rsindex db9b68705d..6397a24c81 100644--- a/src-tauri/src/commands/saved_sql.rs+++ b/src-tauri/src/commands/saved_sql.rs@@ -94,6 +94,16 @@ pub async fn save_saved_sql_file(state: State<'_, Arc<AppState>>, file: SavedSqlOk(file)}+#[tauri::command]+pub async fn save_default_query_content(+ state: State<'_, Arc<AppState>>,+ id: String,+ sql: String,+ updated_at: String,+) -> Result<(), String> {+ state.storage.save_default_query_content(&id, &sql, &updated_at).await+}+#[tauri::command]pub async fn delete_saved_sql_file(state: State<'_, Arc<AppState>>, id: String) -> Result<(), String> {state.storage.delete_saved_sql_file(&id).awaitdiff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rsindex fd30c0ce32..5b85dfd55f 100644--- a/src-tauri/src/lib.rs+++ b/src-tauri/src/lib.rs@@ -2487,6 +2487,7 @@ pub fn run() {commands::saved_sql::save_saved_sql_folder,commands::saved_sql::delete_saved_sql_folder,commands::saved_sql::save_saved_sql_file,+ commands::saved_sql::save_default_query_content,commands::saved_sql::delete_saved_sql_file,commands::saved_sql::saved_sql_storage_dir,commands::saved_sql::open_saved_sql_storage_dir,