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(objects): 修复对象浏览器未应用侧边栏名称过滤器 (#13767)

jingouzhui7c9f67d4f746
diff --git a/apps/desktop/src/components/objects/ObjectBrowser.vue b/apps/desktop/src/components/objects/ObjectBrowser.vue
index db698d49e6..e9cda726ee 100644
--- a/apps/desktop/src/components/objects/ObjectBrowser.vue
+++ b/apps/desktop/src/components/objects/ObjectBrowser.vue
@@ -89,7 +89,24 @@ import ObjectDependenciesPanel from "@/components/objects/ObjectDependenciesPane
import { objectDependencyTarget, type ObjectDependencyTarget, type ObjectDetailsSection } from "@/lib/database/objectDependencyDetails";
import type { SqlObjectNavigationTarget } from "@/lib/sql/sqlNavigation";
import type { QueryTab } from "@/types/database";
-import type { ColumnInfo, ConnectionConfig, ConstraintInfo, ForeignKeyInfo, IndexInfo, ObjectBrowserViewMode, ObjectBrowserViewport, ObjectInfo, ObjectSourceKind, ObjectStatistics, PgTablePartitioning, SchemaIndexIdentity, TableInfoTab, TreeNode, TriggerInfo } from "@/types/database";
+import type {
+ ColumnInfo,
+ ConnectionConfig,
+ ConstraintInfo,
+ ForeignKeyInfo,
+ IndexInfo,
+ ObjectBrowserViewMode,
+ ObjectBrowserViewport,
+ ObjectInfo,
+ ObjectSourceKind,
+ ObjectStatistics,
+ PgTablePartitioning,
+ SchemaIndexIdentity,
+ TableInfoTab,
+ TableNameFilter,
+ TreeNode,
+ TriggerInfo,
+} from "@/types/database";
import { sortTablesByFkDependency, type TableWithFk } from "@/lib/table/tableDependencySort";
import { isSchemaAware, supportsTableVacuum, supportsTransfer } from "@/lib/database/databaseCapabilities";
import { supportsAiAssistantContext, supportsDataDictionary, supportsSchemaDiagram, supportsTableImport, supportsTableStructureEditing, supportsTableTruncate } from "@/lib/database/databaseFeatureSupport";
@@ -194,6 +211,7 @@ import { formatShortcut } from "@/lib/editor/shortcutRegistry";
import { batchTableEmptyFeedback, buildBatchTableEmptyPlan, runBatchTableEmpty, type BatchTableEmptyPlanItem } from "@/lib/sidebar/batchTableEmpty";
import { runBatchTableDrop } from "@/lib/table/batchTableDrop";
import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
+import { matchesTableNameFilter } from "@/lib/table/tableVGroup";
import { filterSchemaNamesForConnection } from "@/lib/database/visibleDatabases";
import {
buildObjectBrowserRows,
@@ -659,9 +677,25 @@ const { addTask: addExportTask, updateTableExportTask } = exportTracker;
const needsSchema = computed(() => isSchemaAware(props.connection.db_type) && !connectionUsesDatabaseObjectTreeMode(props.connection));
const canDropTargetCascade = computed(() => dropTarget.value?.type === "TABLE" && supportsDropTableCascade(effectiveDatabaseType.value));
const canTruncateTargetCascade = computed(() => !!truncateTarget.value && supportsTruncateTableCascade(effectiveDatabaseType.value));
-const objectCounts = computed(() => countObjectBrowserRowsByFilter(rows.value));
+const objectNameFilters = computed(() => {
+ const groupTypes = { TABLE: "group-tables", VIEW: "group-views", MATERIALIZED_VIEW: "group-materialized-views", PROCEDURE: "group-procedures", FUNCTION: "group-functions" } as const;
+ const filters: Partial<Record<ObjectBrowserRow["type"], TableNameFilter>> = {};
+ for (const [type, nodeKind] of Object.entries(groupTypes)) {
+ filters[type as keyof typeof groupTypes] = connectionStore.tableNameFilterForScope({
+ connectionId: props.connection.id,
+ database: props.database,
+ schema: connectionObjectTreeNodeSchema(props.connection, props.database, selectedSchema.value),
+ catalog: props.catalog,
+ nodeKind,
+ });
+ }
+ return filters;
+});
+// Keep cached metadata intact so clearing a saved filter restores rows immediately.
+const nameFilteredRows = computed(() => rows.value.filter((row) => matchesTableNameFilter(row.name, objectNameFilters.value[row.type])));
+const objectCounts = computed(() => countObjectBrowserRowsByFilter(nameFilteredRows.value));
// Count direct search matches once; partition parents rendered only for context must not inflate badges.
-const objectSearchSummary = computed(() => summarizeObjectBrowserSearch(rows.value, search.value));
+const objectSearchSummary = computed(() => summarizeObjectBrowserSearch(nameFilteredRows.value, search.value));
const canOpenStructureEditor = computed(() => supportsTableStructureEditing(tableStructureDatabaseType.value));
const canCreateSchemaIndex = computed(() => supportsSchemaIndexes.value && !connectionIsEffectivelyReadOnly(props.connection));
const canOpenDiagram = computed(() => !!props.database && supportsSchemaDiagram(effectiveDatabaseType.value));
@@ -940,7 +974,7 @@ const filteredRows = computed(() => groupedRows.value.rows);
function partitionRowDepth(row: ObjectBrowserRow): number {
return groupedRows.value.depths.get(row.id) ?? 0;
}
-const selectableRows = computed(() => rows.value);
+const selectableRows = computed(() => nameFilteredRows.value);
// ---- Grid (tile) view virtualization ----
// The grid view chunks filteredRows into fixed-height rows and hands them to
@@ -1249,9 +1283,9 @@ function removePinnedObjectBrowserRows(rows: readonly ObjectBrowserRow[]) {
}
function groupedFilteredRows() {
- if (usesServerObjectPaging.value) return { rows: rows.value, depths: new Map<string, number>() };
+ if (usesServerObjectPaging.value) return { rows: nameFilteredRows.value, depths: new Map<string, number>() };
return groupObjectBrowserRows({
- rows: rows.value.filter(rowMatchesObjectFilter),
+ rows: nameFilteredRows.value.filter(rowMatchesObjectFilter),
matchingRows: objectSearchSummary.value.matchingRows.filter(rowMatchesObjectFilter),
query: search.value.trim(),
expandedPartitionParentIds: expandedPartitionParentIds.value,
@@ -6153,7 +6187,7 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
<div v-else-if="error && !isSchemaIndexInfo" class="flex flex-1 items-center justify-center px-6 text-center text-sm text-destructive">
{{ error }}
</div>
- <div v-else-if="filteredRows.length === 0 && !isEventEditor && !isSchemaIndexInfo" class="flex flex-1 items-center justify-center text-sm text-muted-foreground">
+ <div v-else-if="filteredRows.length === 0 && !isEventEditor && !isSchemaIndexInfo && !(usesServerObjectPaging && hasMoreObjects)" class="flex flex-1 items-center justify-center text-sm text-muted-foreground">
{{ t("objects.empty") }}
</div>
<div v-else class="flex min-h-0 min-w-0 flex-1" :class="{ 'event-editor-layout': isEventEditor }">
@@ -6428,7 +6462,7 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
</RecycleScroller>
</div>
<div v-if="usesServerObjectPaging" class="flex shrink-0 items-center justify-between gap-2 border-t px-3 py-2 text-xs text-muted-foreground">
- <span>{{ t("objects.pagedOrder", { count: rows.length }) }}</span>
+ <span>{{ t("objects.pagedOrder", { count: nameFilteredRows.length }) }}</span>
<Button v-if="hasMoreObjects" data-object-load-more variant="outline" size="sm" :disabled="loadingMoreObjects" @click="loadObjectPage(true)">
<Loader2 v-if="loadingMoreObjects" class="mr-1.5 h-3.5 w-3.5 animate-spin" />
{{ t("tree.loadMore") }}
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.constraints.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.constraints.component.spec.ts
index baf674f66a..55c19865d5 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.constraints.component.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.constraints.component.spec.ts
@@ -27,6 +27,7 @@ vi.mock("@/stores/connectionStore", () => ({
useConnectionStore: () => ({
getConfig: () => connection,
ensureConnected: vi.fn().mockResolvedValue(undefined),
+ tableNameFilterForScope: () => undefined,
orderByPinnedTreeNodes: (rows: unknown[]) => rows,
}),
}));
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.eventCreate.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.eventCreate.component.spec.ts
index b429e199bc..d2f30dd514 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.eventCreate.component.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.eventCreate.component.spec.ts
@@ -22,6 +22,7 @@ vi.mock("@/stores/connectionStore", () => ({
useConnectionStore: () => ({
ensureConnected: mocks.ensureConnected,
getConfig: () => connection,
+ tableNameFilterForScope: () => undefined,
orderByPinnedTreeNodes: (rows: unknown[]) => rows,
}),
}));
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.exportQueue.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.exportQueue.component.spec.ts
index 71f00237d7..353ca5f1a0 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.exportQueue.component.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.exportQueue.component.spec.ts
@@ -30,7 +30,7 @@ vi.mock("@/lib/backend/api", () => ({
exportQueryResultJson: mocks.json,
buildTableSelectSql: vi.fn(async ({ tableName }) => `SELECT * FROM ${tableName}`),
}));
-vi.mock("@/stores/connectionStore", () => ({ useConnectionStore: () => ({ getConfig: () => connection, ensureConnected: vi.fn(async () => undefined), connectionIdentifierQuote: () => "`", orderByPinnedTreeNodes: (rows: unknown[]) => rows }) }));
+vi.mock("@/stores/connectionStore", () => ({ useConnectionStore: () => ({ getConfig: () => connection, ensureConnected: vi.fn(async () => undefined), connectionIdentifierQuote: () => "`", tableNameFilterForScope: () => undefined, orderByPinnedTreeNodes: (rows: unknown[]) => rows }) }));
vi.mock("@/stores/queryStore", () => ({ useQueryStore: () => ({}) }));
vi.mock("@/stores/settingsStore", () => ({ useSettingsStore: () => ({ editorSettings: mocks.settings }) }));
vi.mock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => true }));
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.locateSidebar.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.locateSidebar.component.spec.ts
index ee3846adb0..21f9cab789 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.locateSidebar.component.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.locateSidebar.component.spec.ts
@@ -28,6 +28,7 @@ vi.mock("@/stores/connectionStore", () => ({
useConnectionStore: () => ({
getConfig: () => connection,
ensureConnected: mocks.ensureConnected,
+ tableNameFilterForScope: () => undefined,
orderByPinnedTreeNodes: (rows: unknown[]) => rows,
}),
}));
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.nameFilter.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.nameFilter.component.spec.ts
new file mode 100644
index 0000000000..87fac578c2
--- /dev/null
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.nameFilter.component.spec.ts
@@ -0,0 +1,145 @@
+// @vitest-environment happy-dom
+
+import { createApp, defineComponent, h, nextTick, reactive, type App } from "vue";
+import { createPinia, setActivePinia } from "pinia";
+import { createI18n } from "vue-i18n";
+import { afterEach, beforeEach, expect, it, vi } from "vitest";
+import ObjectBrowser from "@/components/objects/ObjectBrowser.vue";
+import { useConnectionStore } from "@/stores/connectionStore";
+import { useSettingsStore } from "@/stores/settingsStore";
+import { invalidateObjectBrowserRowsCache } from "@/lib/table/objectBrowserRowsCache";
+import { listObjects } from "@/lib/backend/api";
+import type { ConnectionConfig } from "@/types/database";
+
+vi.mock("@/lib/backend/api", async (importOriginal) => ({
+ ...(await importOriginal<typeof import("@/lib/backend/api")>()),
+ listSchemas: vi.fn().mockResolvedValue(["public", "other"]),
+ listObjects: vi.fn().mockResolvedValue([
+ { name: "orders", object_type: "TABLE", schema: "public" },
+ { name: "orders_bak", object_type: "TABLE", schema: "public" },
+ { name: "bak_orders", object_type: "TABLE", schema: "public" },
+ ]),
+ listObjectStatistics: vi.fn().mockResolvedValue([]),
+}));
+vi.mock("vue-virtual-scroller", () => ({
+ RecycleScroller: defineComponent({
+ props: ["items"],
+ setup:
+ (props, { slots }) =>
+ () =>
+ h(
+ "div",
+ props.items.map((item: unknown) => slots.default?.({ item })),
+ ),
+ }),
+}));
+
+let app: App;
+let pinia: ReturnType<typeof createPinia>;
+let host: HTMLElement;
+
+beforeEach(() => {
+ invalidateObjectBrowserRowsCache({});
+ pinia = createPinia();
+ setActivePinia(pinia);
+});
+afterEach(() => {
+ app?.unmount();
+ host?.remove();
+ vi.restoreAllMocks();
+ invalidateObjectBrowserRowsCache({});
+ localStorage.clear();
+});
+
+const connection = { id: "filter-13599", name: "HighGo", db_type: "highgo", database: "app", driver_profile: null, transport_layers: [] } as unknown as ConnectionConfig;
+
+async function mountBrowser(config = connection, selectedObjectFilter?: "all" | "tables", readySelector = '[title="orders"]') {
+ const store = useConnectionStore();
+ vi.spyOn(store, "ensureConnected").mockResolvedValue(undefined);
+ useSettingsStore().editorSettings.objectBrowserViewMode = "list";
+ const props = reactive({ connection: config, database: "app", schema: "public", selectedObjectFilter, catalog: undefined as string | undefined });
+ host = document.createElement("div");
+ document.body.append(host);
+ app = createApp({ render: () => h(ObjectBrowser, props) });
+ app.use(pinia);
+ app.use(createI18n({ legacy: false, locale: "en", messages: { en: {} }, missingWarn: false, fallbackWarn: false }));
+ app.mount(host);
+ await vi.waitFor(() => expect(host.querySelector(readySelector)).not.toBeNull());
+ return props;
+}
+
+it("applies the sidebar name filter to the right-hand browser and reacts to clearing it (#13599)", async () => {
+ const store = useConnectionStore();
+ const scope = { connectionId: connection.id, database: "app", schema: "public", nodeKind: "group-tables" };
+ store.setSidebarTableNameFilter(store.tableNameFilterScopeKey(scope), { includePatterns: [], excludePatterns: ["%_bak", "bak_%"] });
+ await mountBrowser();
+ expect(host.querySelector('[title="orders_bak"]')).toBeNull();
+ expect(host.querySelector('[title="bak_orders"]')).toBeNull();
+ expect(host.querySelector("[data-object-filter-count]")?.textContent?.trim()).toBe("objects.tables 1");
+
+ const search = host.querySelector<HTMLInputElement>("[data-object-search-input]")!;
+ search.value = "bak";
+ search.dispatchEvent(new Event("input", { bubbles: true }));
+ await nextTick();
+ expect(host.querySelector('[title="orders_bak"]')).toBeNull();
+ search.value = "";
+ search.dispatchEvent(new Event("input", { bubbles: true }));
+
+ app.unmount();
+ host.remove();
+ await mountBrowser();
+ expect(host.querySelector('[title="orders_bak"]')).toBeNull();
+ store.setSidebarTableNameFilter(store.tableNameFilterScopeKey(scope), { includePatterns: [], excludePatterns: [] });
+ await nextTick();
+ expect(host.querySelector('[title="orders_bak"]')).not.toBeNull();
+ expect(host.querySelector('[title="bak_orders"]')).not.toBeNull();
+ expect(host.querySelector("[data-object-filter-count]")?.textContent?.trim()).toBe("objects.tables 3");
+});
+
+it("isolates filters by object kind, schema, catalog and connection", async () => {
+ const store = useConnectionStore();
+ const scope = { connectionId: connection.id, database: "app", schema: "public" };
+ store.setSidebarTableNameFilter(store.tableNameFilterScopeKey(scope), { includePatterns: ["orders"], excludePatterns: [] });
+ vi.mocked(listObjects).mockResolvedValueOnce([
+ { name: "orders", object_type: "TABLE", schema: "public" },
+ { name: "orders_bak", object_type: "TABLE", schema: "public" },
+ { name: "orders_view", object_type: "VIEW", schema: "public" },
+ ]);
+ const mixedProps = await mountBrowser(connection, "all");
+ expect(host.querySelector('[title="orders_bak"]')).toBeNull();
+ expect(host.querySelector('[title="orders_view"]')).not.toBeNull();
+ store.setSidebarTableNameFilter(store.tableNameFilterScopeKey({ ...scope, nodeKind: "group-views" }), { includePatterns: [], excludePatterns: ["%view"] });
+ await nextTick();
+ expect(host.querySelector('[title="orders_view"]')).toBeNull();
+
+ mixedProps.schema = "other";
+ await vi.waitFor(() => expect(host.querySelector('[title="orders_bak"]')).not.toBeNull());
+ mixedProps.schema = "public";
+ await vi.waitFor(() => expect(host.querySelector('[title="orders_bak"]')).toBeNull());
+ mixedProps.catalog = "other-catalog";
+ await vi.waitFor(() => expect(host.querySelector('[title="orders_bak"]')).not.toBeNull());
+ mixedProps.catalog = undefined;
+ mixedProps.connection = { ...connection, id: "other-connection" };
+ await vi.waitFor(() => expect(host.querySelector('[title="orders_bak"]')).not.toBeNull());
+});
+
+it("keeps loading more available when an entire server page is excluded", async () => {
+ const config = { ...connection, db_type: "oceanbase-oracle" } as ConnectionConfig;
+ const store = useConnectionStore();
+ store.setSidebarTableNameFilter(store.tableNameFilterScopeKey({ connectionId: config.id, database: "app", schema: "public" }), { includePatterns: [], excludePatterns: ["bak_%"] });
+ useSettingsStore().desktopSettings.sidebar_table_page_size = 2;
+ vi.mocked(listObjects)
+ .mockResolvedValueOnce([
+ { name: "bak_one", object_type: "TABLE", schema: "public" },
+ { name: "bak_two", object_type: "TABLE", schema: "public" },
+ { name: "orders", object_type: "TABLE", schema: "public" },
+ ])
+ .mockResolvedValueOnce([{ name: "orders", object_type: "TABLE", schema: "public" }]);
+ await mountBrowser(config, "tables", "[data-object-load-more]");
+ expect(host.querySelector('[title="bak_one"]')).toBeNull();
+ expect(host.querySelector('[title="bak_two"]')).toBeNull();
+ host.querySelector<HTMLButtonElement>("[data-object-load-more]")!.click();
+ await vi.waitFor(() => expect(host.querySelector('[title="orders"]')).not.toBeNull());
+ expect(vi.mocked(listObjects).mock.calls.at(-1)?.[6]).toBe(2);
+ expect(host.querySelector("[data-object-load-more]")).toBeNull();
+});
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.oceanbaseCommentSearch.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.oceanbaseCommentSearch.component.spec.ts
index 6bce3eefd1..8eee06cfb7 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.oceanbaseCommentSearch.component.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.oceanbaseCommentSearch.component.spec.ts
@@ -20,6 +20,7 @@ vi.mock("@/stores/connectionStore", () => ({
useConnectionStore: () => ({
getConfig: () => connection,
ensureConnected: vi.fn().mockResolvedValue(undefined),
+ tableNameFilterForScope: () => undefined,
orderByPinnedTreeNodes: (rows: unknown[]) => rows,
}),
}));
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.oceanbasePagination.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.oceanbasePagination.component.spec.ts
index 133014c52f..9211ff7465 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.oceanbasePagination.component.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.oceanbasePagination.component.spec.ts
@@ -14,7 +14,7 @@ vi.mock("@/lib/backend/api", () => ({
listObjectStatistics: vi.fn().mockResolvedValue([]),
}));
vi.mock("@/stores/connectionStore", () => ({
- useConnectionStore: () => ({ getConfig: () => connection, connectedIds: new Set([connection.id]), connectionStateRevision: () => 0, ensureConnected: vi.fn().mockResolvedValue(undefined), orderByPinnedTreeNodes: (rows: unknown[]) => rows }),
+ useConnectionStore: () => ({ getConfig: () => connection, connectedIds: new Set([connection.id]), connectionStateRevision: () => 0, ensureConnected: vi.fn().mockResolvedValue(undefined), tableNameFilterForScope: () => undefined, orderByPinnedTreeNodes: (rows: unknown[]) => rows }),
}));
vi.mock("@/stores/queryStore", () => ({ useQueryStore: () => ({}) }));
vi.mock("@/stores/settingsStore", () => ({
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.routineSourceTab.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.routineSourceTab.component.spec.ts
index 2c1652cb98..ce31d28736 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.routineSourceTab.component.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.routineSourceTab.component.spec.ts
@@ -39,6 +39,7 @@ vi.mock("@/stores/connectionStore", () => ({
treeClipboard: null,
ensureConnected: mocks.ensureConnected,
getConfig: () => connection,
+ tableNameFilterForScope: () => undefined,
orderByPinnedTreeNodes: (rows: unknown[]) => rows,
}),
}));
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.schemaIndexes.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.schemaIndexes.component.spec.ts
index ebc0f71fb5..843d2e8feb 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.schemaIndexes.component.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.schemaIndexes.component.spec.ts
@@ -9,7 +9,7 @@ import type { ConnectionConfig, IndexInfo, ObjectInfo } from "@/types/database";
const mocks = vi.hoisted(() => ({ listObjects: vi.fn(), listTables: vi.fn(), listIndexes: vi.fn(), getColumns: vi.fn(), getTableDdl: vi.fn(), openTableStructure: vi.fn(), executeQuery: vi.fn(), executeBatch: vi.fn(), toolbarTier: 0 }));
const ddlSettings = vi.hoisted(() => ({ separateDdlIndexes: false, includeDdlStorage: true, compactDdlSql: false, sidebarMenuLayout: "grouped" }));
vi.mock("@/lib/backend/api", () => ({ ...mocks, listSchemas: vi.fn().mockResolvedValue([" Mixed "]), listObjectStatistics: vi.fn().mockResolvedValue([]), loadSchemaCache: vi.fn().mockResolvedValue(null), saveSchemaCache: vi.fn(), deleteSchemaCachePrefix: vi.fn() }));
-vi.mock("@/stores/connectionStore", () => ({ useConnectionStore: () => ({ getConfig: () => connection, ensureConnected: vi.fn().mockResolvedValue(undefined), orderByPinnedTreeNodes: (rows: unknown[]) => rows }) }));
+vi.mock("@/stores/connectionStore", () => ({ useConnectionStore: () => ({ getConfig: () => connection, ensureConnected: vi.fn().mockResolvedValue(undefined), tableNameFilterForScope: () => undefined, orderByPinnedTreeNodes: (rows: unknown[]) => rows }) }));
vi.mock("@/stores/queryStore", () => ({ useQueryStore: () => ({ openTableStructure: mocks.openTableStructure }) }));
vi.mock("@/stores/settingsStore", () => ({
useSettingsStore: () => ({
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.singleKindObjectCount.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.singleKindObjectCount.component.spec.ts
index 194b9cf014..3f5a2c19bf 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.singleKindObjectCount.component.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.singleKindObjectCount.component.spec.ts
@@ -32,6 +32,7 @@ vi.mock("@/stores/connectionStore", () => ({
useConnectionStore: () => ({
getConfig: () => connection,
ensureConnected: mocks.ensureConnected,
+ tableNameFilterForScope: () => undefined,
orderByPinnedTreeNodes: (rows: unknown[]) => rows,
}),
}));
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.slowSchemaList.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.slowSchemaList.component.spec.ts
index 9770bdeed3..45769aaa53 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.slowSchemaList.component.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.slowSchemaList.component.spec.ts
@@ -21,6 +21,7 @@ vi.mock("@/stores/connectionStore", () => ({
useConnectionStore: () => ({
getConfig: () => connection,
ensureConnected: mocks.ensureConnected,
+ tableNameFilterForScope: () => undefined,
orderByPinnedTreeNodes: (rows: unknown[]) => rows,
}),
}));
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.statisticsRefresh.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.statisticsRefresh.component.spec.ts
index c4c7c5e00f..9c9487382e 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.statisticsRefresh.component.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.statisticsRefresh.component.spec.ts
@@ -23,6 +23,7 @@ vi.mock("@/stores/connectionStore", () => ({
useConnectionStore: () => ({
getConfig: () => connection,
ensureConnected: mocks.ensureConnected,
+ tableNameFilterForScope: () => undefined,
orderByPinnedTreeNodes: (rows: unknown[]) => rows,
}),
}));
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.tableCopyClipboard.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.tableCopyClipboard.component.spec.ts
index b1e6fcd036..539d41d109 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.tableCopyClipboard.component.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.tableCopyClipboard.component.spec.ts
@@ -32,6 +32,7 @@ vi.mock("@/stores/connectionStore", () => ({
},
ensureConnected: mocks.ensureConnected,
getConfig: () => connection,
+ tableNameFilterForScope: () => undefined,
orderByPinnedTreeNodes: (rows: unknown[]) => rows,
}),
}));
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.validityStatus.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.validityStatus.component.spec.ts
index 569c8096df..374306f22a 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.validityStatus.component.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.validityStatus.component.spec.ts
@@ -24,6 +24,7 @@ vi.mock("@/stores/connectionStore", () => ({
useConnectionStore: () => ({
getConfig: () => connection,
ensureConnected: mocks.ensureConnected,
+ tableNameFilterForScope: () => undefined,
orderByPinnedTreeNodes: (rows: unknown[]) => rows,
}),
}));
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.viewSourceSave.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.viewSourceSave.spec.ts
index d6ebbc32ac..4d7aede2fc 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.viewSourceSave.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.viewSourceSave.spec.ts
@@ -52,6 +52,7 @@ vi.mock("@/stores/connectionStore", () => ({
treeClipboard: null,
ensureConnected: mocks.ensureConnected,
getConfig: () => connection,
+ tableNameFilterForScope: () => undefined,
orderByPinnedTreeNodes: (rows: unknown[]) => rows,
refreshObjectListTreeNode: mocks.refreshObjectListTreeNode,
}),
diff --git a/apps/desktop/src/lib/table/tableVGroup.ts b/apps/desktop/src/lib/table/tableVGroup.ts
index fb779b5357..14e31a2f00 100644
--- a/apps/desktop/src/lib/table/tableVGroup.ts
+++ b/apps/desktop/src/lib/table/tableVGroup.ts
@@ -66,19 +66,22 @@ function matchesTableNamePattern(name: string, pattern: string): boolean {
return previous[value.length]!;
}
+export function matchesTableNameFilter(name: string, filter?: TableNameFilter): boolean {
+ const include = filter?.includePatterns.filter((pattern) => pattern.trim()) ?? [];
+ const exclude = filter?.excludePatterns.filter((pattern) => pattern.trim()) ?? [];
+ return (!include.length || include.some((pattern) => matchesTableNamePattern(name, pattern))) && !exclude.some((pattern) => matchesTableNamePattern(name, pattern));
+}
+
/** Only real group members need supplementary metadata, never ungrouped order entries. */
export function missingTableVGroupMemberNames(layout: TableVGroupLayout | null | undefined, loadedNames: ReadonlySet<string>, filter?: TableNameFilter): string[] {
if (!layout || !tableVGroupsEnabled(layout)) return [];
- const include = filter?.includePatterns.filter((pattern) => pattern.trim()) ?? [];
- const exclude = filter?.excludePatterns.filter((pattern) => pattern.trim()) ?? [];
const names = new Set<string>();
const visit = (entries: TableVGroupOrderEntry[], inGroup: boolean) => {
for (const entry of entries) {
if (entry.type === "group") {
visit(entry.children ?? [], true);
} else if (inGroup && (!entry.rowType || entry.rowType === "table") && !loadedNames.has(entry.name)) {
- if (include.length && !include.some((pattern) => matchesTableNamePattern(entry.name, pattern))) continue;
- if (exclude.some((pattern) => matchesTableNamePattern(entry.name, pattern))) continue;
+ if (!matchesTableNameFilter(entry.name, filter)) continue;
names.add(entry.name);
}
}