Skip to content

armgit / dbx

Public Imported from GitHub
0

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。

fix(editor): sync renamed query tab title to saved SQL library (#12831)

lxk9559f2ac217600b
diff --git a/apps/desktop/src/components/layout/EditorGroupTabBar.vue b/apps/desktop/src/components/layout/EditorGroupTabBar.vue
index af73885787..1670e0018f 100644
--- a/apps/desktop/src/components/layout/EditorGroupTabBar.vue
+++ b/apps/desktop/src/components/layout/EditorGroupTabBar.vue
@@ -1395,13 +1395,13 @@ function startRenameTab(tab: QueryTab) {
});
}
-function commitRenameTab(tab: QueryTab) {
+async function commitRenameTab(tab: QueryTab) {
if (editingTabId.value !== tab.id) {
return;
}
const title = editingTitle.value.trim();
if (title) {
- queryStore.renameTab(tab.id, title);
+ await queryStore.renameTab(tab.id, title);
}
editingTabId.value = null;
}
diff --git a/apps/desktop/src/stores/__tests__/queryStore.renameSavedSqlTab.spec.ts b/apps/desktop/src/stores/__tests__/queryStore.renameSavedSqlTab.spec.ts
new file mode 100644
index 0000000000..cf7c917be7
--- /dev/null
+++ b/apps/desktop/src/stores/__tests__/queryStore.renameSavedSqlTab.spec.ts
@@ -0,0 +1,154 @@
+import { createPinia, setActivePinia } from "pinia";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import * as api from "@/lib/backend/api";
+import { useQueryStore } from "@/stores/queryStore";
+import { useSavedSqlStore } from "@/stores/savedSqlStore";
+import type { SavedSqlFile } from "@/types/database";
+
+const mocks = vi.hoisted(() => ({
+ toast: vi.fn(),
+}));
+
+vi.mock("@/composables/useToast", () => ({
+ useToast: () => ({ toast: mocks.toast }),
+}));
+
+vi.mock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => true }));
+
+vi.mock("@/lib/backend/api", async (importOriginal) => ({
+ ...(await importOriginal<typeof import("@/lib/backend/api")>()),
+ loadSavedSqlLibrary: vi.fn(),
+ loadSavedSqlFilesForSync: vi.fn(),
+ loadSavedSqlFile: vi.fn(),
+ saveSavedSqlFile: vi.fn(async (file: SavedSqlFile) => file),
+ syncSavedSqlDirectory: vi.fn(),
+}));
+
+const timestamp = "2026-10-20T00:00:00.000Z";
+
+const savedFile1: SavedSqlFile = {
+ id: "file-1",
+ connectionId: "conn-1",
+ database: "testdb",
+ name: "original_query.sql",
+ sql: "SELECT 1;",
+ sqlLoaded: true,
+ createdAt: timestamp,
+ updatedAt: timestamp,
+};
+
+const savedFile2: SavedSqlFile = {
+ id: "file-2",
+ connectionId: "conn-1",
+ database: "testdb",
+ name: "another_query.sql",
+ sql: "SELECT 2;",
+ sqlLoaded: true,
+ createdAt: timestamp,
+ updatedAt: timestamp,
+};
+
+function installLocalStorage() {
+ const data = new Map<string, string>();
+ vi.stubGlobal("localStorage", {
+ getItem: (key: string) => data.get(key) ?? null,
+ setItem: (key: string, value: string) => data.set(key, value),
+ removeItem: (key: string) => data.delete(key),
+ });
+}
+
+describe("queryStore renameTab with saved SQL (#12816)", () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ vi.unstubAllGlobals();
+ installLocalStorage();
+ setActivePinia(createPinia());
+ });
+
+ it("renames an unsaved query tab without touching savedSqlStore", async () => {
+ const queryStore = useQueryStore();
+ const tabId = queryStore.createTab("conn-1", "testdb", "Query 1", "query", undefined, "SELECT 1;", undefined, { forceNew: true });
+
+ const result = await queryStore.renameTab(tabId, "my_scratchpad");
+ expect(result).toBe(true);
+
+ const tab = queryStore.tabs.find((t) => t.id === tabId);
+ expect(tab?.title).toBe("my_scratchpad");
+ expect(tab?.customTitle).toBe(true);
+ expect(api.saveSavedSqlFile).not.toHaveBeenCalled();
+ });
+
+ it("renames a saved SQL tab and updates the savedSqlStore file and metadata", async () => {
+ const savedSqlStore = useSavedSqlStore();
+ savedSqlStore.files = [{ ...savedFile1 }];
+
+ const queryStore = useQueryStore();
+ const tabId = queryStore.openSavedSql(savedFile1);
+
+ const tab = queryStore.tabs.find((t) => t.id === tabId)!;
+ expect(tab.title).toBe("original_query.sql");
+
+ const result = await queryStore.renameTab(tabId, "renamed_report");
+ expect(result).toBe(true);
+
+ expect(tab.title).toBe("renamed_report.sql");
+ expect(tab.customTitle).toBe(true);
+
+ const fileInStore = savedSqlStore.getFile(savedFile1.id);
+ expect(fileInStore?.name).toBe("renamed_report.sql");
+
+ expect(api.saveSavedSqlFile).toHaveBeenCalledWith(
+ expect.objectContaining({
+ id: savedFile1.id,
+ name: "renamed_report.sql",
+ }),
+ );
+ });
+
+ it("updates all tabs sharing the same savedSqlId when one tab is renamed", async () => {
+ const savedSqlStore = useSavedSqlStore();
+ savedSqlStore.files = [{ ...savedFile1 }];
+
+ const queryStore = useQueryStore();
+ const tab1Id = queryStore.openSavedSql(savedFile1);
+ const tab2Id = queryStore.createTab("conn-1", "testdb", savedFile1.name, "query", undefined, savedFile1.sql, undefined, { forceNew: true });
+ queryStore.linkSavedSql(tab2Id, savedFile1.id);
+
+ const result = await queryStore.renameTab(tab1Id, "shared_new_name.sql");
+ expect(result).toBe(true);
+
+ const tab1 = queryStore.tabs.find((t) => t.id === tab1Id);
+ const tab2 = queryStore.tabs.find((t) => t.id === tab2Id);
+ expect(tab1?.title).toBe("shared_new_name.sql");
+ expect(tab2?.title).toBe("shared_new_name.sql");
+ });
+
+ it("reverts the tab title and displays a toast when renaming causes a name conflict", async () => {
+ const savedSqlStore = useSavedSqlStore();
+ savedSqlStore.files = [{ ...savedFile1 }, { ...savedFile2 }];
+
+ const queryStore = useQueryStore();
+ const tabId = queryStore.openSavedSql(savedFile1);
+
+ const tab = queryStore.tabs.find((t) => t.id === tabId)!;
+ expect(tab.title).toBe("original_query.sql");
+
+ // Attempt to rename file-1 to file-2's name: another_query.sql
+ const result = await queryStore.renameTab(tabId, "another_query");
+ expect(result).toBe(false);
+
+ expect(tab.title).toBe("original_query.sql");
+ expect(mocks.toast).toHaveBeenCalled();
+ });
+
+ it("rejects an empty or whitespace-only name without modifying tab title", async () => {
+ const queryStore = useQueryStore();
+ const tabId = queryStore.createTab("conn-1", "testdb", "Original", "query", undefined, "SELECT 1;", undefined, { forceNew: true });
+
+ const result = await queryStore.renameTab(tabId, " ");
+ expect(result).toBe(false);
+
+ const tab = queryStore.tabs.find((t) => t.id === tabId);
+ expect(tab?.title).toBe("Original");
+ });
+});
diff --git a/apps/desktop/src/stores/queryStore.ts b/apps/desktop/src/stores/queryStore.ts
index de5022a330..4b91e48c6a 100644
--- a/apps/desktop/src/stores/queryStore.ts
+++ b/apps/desktop/src/stores/queryStore.ts
@@ -5988,13 +5988,26 @@ export const useQueryStore = defineStore("query", () => {
tab.nacosConfigEditorViewport = next;
}
- function renameTab(id: string, title: string) {
+ async function renameTab(id: string, title: string) {
const trimmed = title.trim();
if (!trimmed) return false;
const tab = tabs.value.find((t) => t.id === id);
if (!tab || tab.mode !== "query") return false;
+ const previousTitle = tab.title;
tab.title = trimmed;
tab.customTitle = true;
+ if (tab.savedSqlId) {
+ try {
+ const saved = await useSavedSqlStore().renameFile(tab.savedSqlId, trimmed);
+ if (saved) {
+ tab.title = saved.name;
+ }
+ } catch (error) {
+ tab.title = previousTitle;
+ useToast().toast(i18n.global.t("savedSql.renameFailed", { message: savedSqlErrorMessage(error, i18n.global.t) }), 5000);
+ return false;
+ }
+ }
return true;
}
diff --git a/packages/app-tests/queryStore.test.ts b/packages/app-tests/queryStore.test.ts
index 987fdd3cf3..6b88de0ddb 100644
--- a/packages/app-tests/queryStore.test.ts
+++ b/packages/app-tests/queryStore.test.ts
@@ -171,12 +171,12 @@ test("setErrorResult stops loading and shows the error result", () => {
assert.deepEqual(tab?.result?.rows, [["metadata failed"]]);
});
-test("renames query tab titles", () => {
+test("renames query tab titles", async () => {
setActivePinia(createPinia());
const store = useQueryStore();
const tabId = store.createTab("conn-1", "db");
- assert.equal(store.renameTab(tabId, " Revenue checks "), true);
+ assert.equal(await store.renameTab(tabId, " Revenue checks "), true);
const tab = store.tabs.find((item) => item.id === tabId);
assert.equal(tab?.title, "Revenue checks");
diff --git a/packages/app-tests/savedSqlStore.test.ts b/packages/app-tests/savedSqlStore.test.ts
index 11351c25cc..4f08ef0256 100644
--- a/packages/app-tests/savedSqlStore.test.ts
+++ b/packages/app-tests/savedSqlStore.test.ts
@@ -915,7 +915,7 @@ test("usage updates do not invalidate the saved SQL database tree", async () =>
assert.ok(store.version > contentVersion);
});
-test("renaming a saved SQL tab keeps the library file name independent", async () => {
+test("renaming a saved SQL tab renames the library file in sync", async () => {
const file: SavedSqlFile = {
id: "sql-1",
connectionId: "conn-1",
@@ -934,12 +934,11 @@ test("renaming a saved SQL tab keeps the library file name independent", async (
const queryStore = useQueryStore();
const tabId = queryStore.openSavedSql(file);
- assert.equal(queryStore.renameTab(tabId, " Revenue checks "), true);
- await Promise.resolve();
+ assert.equal(await queryStore.renameTab(tabId, " Revenue checks "), true);
- assert.equal(queryStore.tabs.find((item) => item.id === tabId)?.title, "Revenue checks");
- assert.equal(savedSqlStore.getFile("sql-1")?.name, "draft.sql");
- assert.equal(apiMock.saveSavedSqlFile.mock.calls.length, 0);
+ assert.equal(queryStore.tabs.find((item) => item.id === tabId)?.title, "Revenue checks.sql");
+ assert.equal(savedSqlStore.getFile("sql-1")?.name, "Revenue checks.sql");
+ assert.equal(apiMock.saveSavedSqlFile.mock.calls.length, 1);
});
test("renaming a saved SQL tab keeps uppercase .SQL extension without double-appending", async () => {
@@ -961,7 +960,7 @@ test("renaming a saved SQL tab keeps uppercase .SQL extension without double-app
const queryStore = useQueryStore();
const tabId = queryStore.openSavedSql(file);
- assert.equal(queryStore.renameTab(tabId, "report.SQL"), true);
+ assert.equal(await queryStore.renameTab(tabId, "report.SQL"), true);
await Promise.resolve();
assert.equal(queryStore.tabs.find((item) => item.id === tabId)?.title, "report.SQL");
@@ -969,17 +968,17 @@ test("renaming a saved SQL tab keeps uppercase .SQL extension without double-app
assert.equal(apiMock.saveSavedSqlFile.mock.calls.length, 0);
});
-test("renaming a saved SQL tab does not persist or revert the library file", async () => {
+test("renaming a saved SQL tab persists the renamed library file", async () => {
const file: SavedSqlFile = { id: "sql-1", connectionId: "conn-1", name: "draft.sql", database: "db", sql: "SELECT 1;", sqlLoaded: true, createdAt: "2026-06-27T00:00:00.000Z", updatedAt: "2026-06-27T00:00:00.000Z" };
apiMock.loadSavedSqlLibrary.mockResolvedValue({ folders: [], files: [file] });
const savedSqlStore = useSavedSqlStore();
await savedSqlStore.initFromStorage();
const queryStore = useQueryStore();
const tabId = queryStore.openSavedSql(file);
- assert.equal(queryStore.renameTab(tabId, "broken"), true);
- assert.equal(queryStore.tabs.find((item) => item.id === tabId)?.title, "broken");
- assert.equal(savedSqlStore.getFile("sql-1")?.name, "draft.sql");
- assert.equal(apiMock.saveSavedSqlFile.mock.calls.length, 0);
+ assert.equal(await queryStore.renameTab(tabId, "broken"), true);
+ assert.equal(queryStore.tabs.find((item) => item.id === tabId)?.title, "broken.sql");
+ assert.equal(savedSqlStore.getFile("sql-1")?.name, "broken.sql");
+ assert.equal(apiMock.saveSavedSqlFile.mock.calls.length, 1);
});
test.each([