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
chore(sidebar): clarify tableName guard scope and add non-trigger routing test (#12912)
lxk9557aefd2ba18bd
diff --git a/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue b/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vueindex d7788b0873..b3f24f7df7 100644--- a/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue+++ b/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue@@ -978,6 +978,8 @@ async function toggle(requestId = beginNavigationRequest()) {// Keep the click path aligned with every object-group definition. In// particular, schema-level trigger/type groups have no tableName, so they// must use the generic object loader rather than the table-trigger loader.+ // !node.tableName is generic: table-level structure groups (columns/indexes/fkeys/constraints/partitions/table triggers)+ // stay off the schema-level object-group loader, not just triggers.const databaseObjectGroup = !!objectTypesForGroupNode(node.type) && !node.tableName;const needsConfiguredTablePageDrain = node.type === "group-tables" && connectionStore.getConfig(node.connectionId || "")?.sidebar_auto_load_all_tables === true && hasTableTreeLoadMore(node.children ?? []);if (databaseObjectGroup && connectionStore.canUseLoadedTreeNodeToggle(node) && !needsConfiguredTablePageDrain) {diff --git a/apps/desktop/src/lib/__tests__/sidebar/sidebarObjectGroupRouting.spec.ts b/apps/desktop/src/lib/__tests__/sidebar/sidebarObjectGroupRouting.spec.tsindex 2a01041cf6..f21411de05 100644--- a/apps/desktop/src/lib/__tests__/sidebar/sidebarObjectGroupRouting.spec.ts+++ b/apps/desktop/src/lib/__tests__/sidebar/sidebarObjectGroupRouting.spec.ts@@ -25,10 +25,11 @@ function mysqlConnection(): ConnectionConfig {} as ConnectionConfig;}-function objectGroup(type: "group-triggers" | "group-synonyms" | "group-types", id: string): TreeNode {+function objectGroup(type: "group-triggers" | "group-synonyms" | "group-types" | "group-columns", id: string): TreeNode {+ const label = type === "group-triggers" ? "tree.triggers" : type === "group-synonyms" ? "tree.synonyms" : type === "group-types" ? "tree.types" : "tree.columns";return {id,- label: type === "group-triggers" ? "tree.triggers" : type === "group-synonyms" ? "tree.synonyms" : "tree.types",+ label,type,connectionId: "mysql-1",database: "app",@@ -213,4 +214,23 @@ describe("sidebar object-group routing", () => {expect(listTriggers).not.toHaveBeenCalled();expect(storedTriggerGroup).toMatchObject({ isExpanded: false, isLoading: false, children: [] });});++ it("keeps table-level non-trigger structure groups off the object-group loader", async () => {+ const listObjects = vi.fn<() => Promise<ObjectInfo[]>>().mockResolvedValue([]);+ const listTriggers = vi.fn<() => Promise<never[]>>().mockResolvedValue([]);+ const { connection, store } = await createStore({ listObjects, listTriggers });+ const tableColumnsGroup: TreeNode = {+ ...objectGroup("group-columns", `${connection.id}:app:app:orders:__columns`),+ tableName: "orders",+ };+ store.treeNodes = [{ id: connection.id, label: connection.name, type: "connection", connectionId: connection.id, children: [tableColumnsGroup] }];+ const storedColumnsGroup = store.treeNodes[0].children![0];++ const handled = await loadSidebarObjectGroup(storedColumnsGroup, store);++ expect(handled).toBe(false);+ expect(listObjects).not.toHaveBeenCalled();+ expect(listTriggers).not.toHaveBeenCalled();+ expect(storedColumnsGroup).toMatchObject({ isExpanded: false, children: [] });+ });});diff --git a/apps/desktop/src/stores/connectionStore.ts b/apps/desktop/src/stores/connectionStore.tsindex 40654ac279..1da535e665 100644--- a/apps/desktop/src/stores/connectionStore.ts+++ b/apps/desktop/src/stores/connectionStore.ts@@ -8293,6 +8293,8 @@ export const useConnectionStore = defineStore("connection", () => {return;}}+ // !node.tableName is generic: table-level structure groups (columns/indexes/fkeys/constraints/partitions/table triggers)+ // stay off the schema-level object-group loader, not just triggers.if (objectTypesForGroupNode(node.type) && !node.tableName) {clearLoadedChildrenCache(node.id, { deletePersisted: false });await loadObjectGroupChildren(node, { force: true });@@ -8369,6 +8371,8 @@ export const useConnectionStore = defineStore("connection", () => {async function refreshTreeNodeForTableNameFilter(node: TreeNode, scopeKey: string, revision: number) {invalidateMetadataCachesForNode(node);+ // !node.tableName is generic: table-level structure groups (columns/indexes/fkeys/constraints/partitions/table triggers)+ // stay off the schema-level object-group loader, not just triggers.if (objectTypesForGroupNode(node.type) && !node.tableName) {clearLoadedChildrenCache(node.id);await loadObjectGroupChildren(node, {@@ -10360,6 +10364,8 @@ export const useConnectionStore = defineStore("connection", () => {if (node.children) await refreshNodes(node.children);continue;}+ // !node.tableName is generic: table-level structure groups (columns/indexes/fkeys/constraints/partitions/table triggers)+ // stay off the schema-level object-group loader, not just triggers.if (objectTypesForGroupNode(node.type) && !node.tableName) {if (node.connectionId && connectedIds.value.has(node.connectionId)) {clearLoadedChildrenCache(node.id);