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(sidebar): keep system databases visible after show all

t8y21e1467083cab
diff --git a/apps/desktop/src/components/connection/ConnectionDialog.vue b/apps/desktop/src/components/connection/ConnectionDialog.vue
index 52e08c35d1..d213047dbf 100644
--- a/apps/desktop/src/components/connection/ConnectionDialog.vue
+++ b/apps/desktop/src/components/connection/ConnectionDialog.vue
@@ -170,8 +170,8 @@ import {
Trash2,
} from "@lucide/vue";
import { buildDraftVisibleDatabasesConnectionId, connectionCanChooseVisibleDatabases, initialVisibleDatabaseSelection, visibleObjectFiltersNeedReset } from "@/lib/connection/connectionVisibleDatabases";
-import { resolveVisibleDatabaseSaveAction } from "@/components/sidebar/visibleDatabasesDialogState";
-import { canSaveVisibleDatabaseSelection, connectionUsesVisibleSchemaFilter, filterDatabaseNamesForVisiblePicker, filterSchemaNamesForVisiblePicker, buildDraftVisibleSchemasConnectionId, normalizeVisibleSchemaSelection } from "@/lib/database/visibleDatabases";
+import { resolveVisibleDatabaseSaveAction, visibleDatabasePatternsWithoutMatchAll } from "@/components/sidebar/visibleDatabasesDialogState";
+import { MATCH_ALL_VISIBLE_DATABASE_PATTERN, canSaveVisibleDatabaseSelection, connectionUsesVisibleSchemaFilter, filterDatabaseNamesForVisiblePicker, filterSchemaNamesForVisiblePicker, buildDraftVisibleSchemasConnectionId, normalizeVisibleSchemaSelection } from "@/lib/database/visibleDatabases";
import { isSchemaAware, isSingleDatabase, supportsDataDictionary, supportsTransaction } from "@/lib/database/databaseFeatureSupport";
import { normalizeConnectionScope, normalizeConnectionTimeouts } from "@/lib/connection/connectionSubmitNormalization";
import { databaseConnectionFormKind, databaseManifestEntry } from "@/lib/database/databaseDriverManifest";
@@ -3195,6 +3195,9 @@ watch(
production_databases: config.production_databases || [],
production_badge_scope: sidebarProductionBadgeScope(config),
visible_databases: config.visible_databases,
+ // 通配符筛选由侧栏弹窗维护;编辑连接时也要带上,否则保存会把它清掉,
+ // “显示全部(含系统库)”的 `%` 也会在下次打开编辑器时丢失。
+ visible_database_patterns: config.visible_database_patterns,
visible_schemas: config.visible_schemas,
save_password: config.save_password !== false,
};
@@ -6102,8 +6105,13 @@ function showAllVisibleDatabases() {
if (visibleFilterUsesSchemas.value) {
handleDraftSchemasShowAll();
form.value.visible_databases = undefined;
+ // schema 模式下的兜底通配符同样会重新隐藏对象;"显示全部"要一并清掉。
+ form.value.visible_database_patterns = undefined;
} else {
form.value.visible_databases = undefined;
+ // 未筛选时系统库默认隐藏。用户展开系统库后点“显示全部”,说明全选范围包含系统库:
+ // 用全匹配通配符记住这一意图,既不冻结当前库名,之后新建的库也仍然自动可见。
+ form.value.visible_database_patterns = visibleDatabaseShowSystem.value && visibleDatabaseHasSystemObjects.value ? [MATCH_ALL_VISIBLE_DATABASE_PATTERN] : undefined;
}
visibleDatabaseSelection.value = new Set();
visibleDatabaseNames.value = [];
@@ -6127,12 +6135,14 @@ function saveVisibleDatabaseSelection() {
defaultVisibleNames: defaultListedVisibleDatabaseNames.value,
configured: form.value.visible_databases,
configuredPatterns: form.value.visible_database_patterns,
- patterns: form.value.visible_database_patterns ?? [],
+ patterns: visibleDatabasePatternsWithoutMatchAll(form.value.visible_database_patterns),
});
if (action.type === "clear") {
form.value.visible_databases = undefined;
+ form.value.visible_database_patterns = undefined;
} else if (action.type === "set") {
form.value.visible_databases = action.databaseNames;
+ form.value.visible_database_patterns = action.patterns.length > 0 ? action.patterns : undefined;
}
}
showVisibleDatabasesDialog.value = false;
diff --git a/apps/desktop/src/components/sidebar/VisibleDatabasesDialog.vue b/apps/desktop/src/components/sidebar/VisibleDatabasesDialog.vue
index d0094c7767..630e33388f 100644
--- a/apps/desktop/src/components/sidebar/VisibleDatabasesDialog.vue
+++ b/apps/desktop/src/components/sidebar/VisibleDatabasesDialog.vue
@@ -6,8 +6,18 @@ import { Button } from "@/components/ui/button";
import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
import { Input } from "@/components/ui/input";
import { useConnectionStore } from "@/stores/connectionStore";
-import { canSaveVisibleDatabaseSelection, connectionUsesVisibleSchemaFilter, databaseNameMatchesVisiblePatterns, filterDatabaseNamesForVisiblePicker, filterSchemaNamesForVisiblePicker, normalizeVisibleDatabaseSelection, parseVisibleDatabasePatternsInput } from "@/lib/database/visibleDatabases";
-import { resolveVisibleDatabaseSaveAction } from "./visibleDatabasesDialogState";
+import {
+ canSaveVisibleDatabaseSelection,
+ connectionUsesVisibleSchemaFilter,
+ databaseNameMatchesVisiblePatterns,
+ filterDatabaseNamesForVisiblePicker,
+ filterSchemaNamesForVisiblePicker,
+ MATCH_ALL_VISIBLE_DATABASE_PATTERN,
+ normalizeVisibleDatabaseSelection,
+ parseVisibleDatabasePatternsInput,
+} from "@/lib/database/visibleDatabases";
+import { initialVisibleDatabaseSelection } from "@/lib/connection/connectionVisibleDatabases";
+import { resolveVisibleDatabaseSaveAction, visibleDatabasePatternsWithoutMatchAll } from "./visibleDatabasesDialogState";
import * as api from "@/lib/backend/api";
const props = defineProps<{
@@ -96,7 +106,7 @@ async function loadDatabases() {
showSystemDatabases.value = false;
const configured = isSchemaFilterMode.value ? connection.value?.visible_schemas?.[databaseKey.value] : connection.value?.visible_databases;
patternInput.value = isSchemaFilterMode.value ? "" : (connection.value?.visible_database_patterns?.join(", ") ?? "");
- const initialSelection = Array.isArray(configured) ? normalizeVisibleDatabaseSelection(configured, names) : listedObjectNames.value;
+ const initialSelection = isSchemaFilterMode.value ? (Array.isArray(configured) ? normalizeVisibleDatabaseSelection(configured, names) : listedObjectNames.value) : initialVisibleDatabaseSelection(names, configured, connection.value);
selectedNames.value = new Set(initialSelection);
const defaultVisible = new Set(defaultObjectNames.value);
showSystemDatabases.value = initialSelection.some((name) => !defaultVisible.has(name));
@@ -150,6 +160,10 @@ function clearSelection() {
async function showAllDatabases() {
if (isSchemaFilterMode.value) {
await connectionStore.clearVisibleSchemas(props.connectionId, databaseKey.value);
+ } else if (showSystemDatabases.value && hasSystemObjects.value) {
+ // 未筛选时系统库默认隐藏;用全匹配通配符保留“显示全部(含系统库)”,
+ // 同时不冻结当前库名,之后新建的库仍会自动出现。
+ await connectionStore.setVisibleDatabaseFilter(props.connectionId, undefined, [MATCH_ALL_VISIBLE_DATABASE_PATTERN]);
} else {
await connectionStore.clearVisibleDatabases(props.connectionId);
}
@@ -171,7 +185,7 @@ async function saveSelection() {
defaultVisibleNames: defaultObjectNames.value,
configured: connection.value?.visible_databases,
configuredPatterns: connection.value?.visible_database_patterns,
- patterns: parsedPatterns.value,
+ patterns: visibleDatabasePatternsWithoutMatchAll(parsedPatterns.value),
});
if (action.type === "none") {
emit("update:open", false);
diff --git a/apps/desktop/src/components/sidebar/__tests__/visibleDatabasesDialogState.spec.ts b/apps/desktop/src/components/sidebar/__tests__/visibleDatabasesDialogState.spec.ts
index 71484ff3d1..4de6c2e308 100644
--- a/apps/desktop/src/components/sidebar/__tests__/visibleDatabasesDialogState.spec.ts
+++ b/apps/desktop/src/components/sidebar/__tests__/visibleDatabasesDialogState.spec.ts
@@ -1,5 +1,5 @@
import { describe, expect, it } from "vitest";
-import { resolveVisibleDatabaseSaveAction } from "../visibleDatabasesDialogState";
+import { resolveVisibleDatabaseSaveAction, visibleDatabasePatternsWithoutMatchAll } from "../visibleDatabasesDialogState";
const allNames = ["data_upload_mid", "ops", "mysql", "performance_schema", "sys"];
const defaultVisibleNames = ["data_upload_mid", "ops"];
@@ -35,6 +35,32 @@ describe("visibleDatabasesDialogState", () => {
expect(resolve(["data_upload_mid", "ops", "mysql"])).toEqual({ type: "set", databaseNames: ["data_upload_mid", "ops", "mysql"], patterns: [] });
});
+ it("persists a match-all wildcard when every database, including system ones, is selected", () => {
+ // “显示系统库”后全选:不能存库名快照(新增库会丢失),也不能按未筛选保存
+ // (默认视图又会隐藏系统库),用全匹配通配符保持动态的全量可见。
+ expect(resolve([...allNames])).toEqual({ type: "set", databaseNames: undefined, patterns: ["%"] });
+ expect(resolve([...allNames], { configuredPatterns: ["%"] })).toEqual({ type: "none" });
+ expect(resolve([...allNames], { configured: [...allNames] })).toEqual({ type: "set", databaseNames: undefined, patterns: ["%"] });
+ });
+
+ it("drops the internal match-all wildcard before resolving the user's patterns", () => {
+ expect(visibleDatabasePatternsWithoutMatchAll(["%", "log_%"])).toEqual(["log_%"]);
+ expect(visibleDatabasePatternsWithoutMatchAll(undefined)).toEqual([]);
+ });
+
+ it("keeps clearing when all names are already the default visible set", () => {
+ expect(
+ resolveVisibleDatabaseSaveAction({
+ selection: new Set(["data_upload_mid", "ops"]),
+ allNames: ["data_upload_mid", "ops"],
+ defaultVisibleNames: ["data_upload_mid", "ops"],
+ configured: ["data_upload_mid", "ops"],
+ configuredPatterns: undefined,
+ patterns: [],
+ }),
+ ).toEqual({ type: "clear" });
+ });
+
it("keeps the list while wildcard patterns are active because the two are unioned", () => {
expect(resolve([...defaultVisibleNames], { patterns: ["log_%"] })).toEqual({
type: "set",
diff --git a/apps/desktop/src/components/sidebar/visibleDatabasesDialogState.ts b/apps/desktop/src/components/sidebar/visibleDatabasesDialogState.ts
index b263665321..23d5a115e1 100644
--- a/apps/desktop/src/components/sidebar/visibleDatabasesDialogState.ts
+++ b/apps/desktop/src/components/sidebar/visibleDatabasesDialogState.ts
@@ -1,6 +1,14 @@
-import { normalizeVisibleDatabaseSelection } from "@/lib/database/visibleDatabases";
+import { MATCH_ALL_VISIBLE_DATABASE_PATTERN, normalizeVisibleDatabaseSelection } from "@/lib/database/visibleDatabases";
-export type VisibleDatabaseSaveAction = { type: "none" } | { type: "clear" } | { type: "set"; databaseNames: string[]; patterns: string[] };
+export type VisibleDatabaseSaveAction = { type: "none" } | { type: "clear" } | { type: "set"; databaseNames: string[] | undefined; patterns: string[] };
+
+/**
+ * 全匹配通配符由“是否显示系统库 + 是否全选”派生,不应该作为用户输入原样保留:
+ * 否则用户取消“显示系统库”后,旧的 `%` 仍会让系统库继续显示。
+ */
+export function visibleDatabasePatternsWithoutMatchAll(patterns: readonly string[] | undefined): string[] {
+ return (patterns ?? []).filter((pattern) => pattern.trim() !== MATCH_ALL_VISIBLE_DATABASE_PATTERN);
+}
export interface VisibleDatabaseSaveInput {
/** 弹窗里当前勾选的库名。 */
@@ -22,6 +30,10 @@ export interface VisibleDatabaseSaveInput {
* 如果用户在弹窗里点的其实就是"全选",把它存成"当时那份库名"的快照会让后来新增的库
* 永久消失(用户会觉得"我明明没设置过筛选")。因此勾选结果与默认可见集合完全一致、
* 且没有通配符时,等价于不筛选,直接按"未筛选"保存。
+ *
+ * 打开"显示系统库"后全选会包含系统库,此时不能只按"未筛选"保存——未筛选的默认视图
+ * 仍然隐藏系统库。也不能保存库名快照,否则新增库不会自动出现。改用全匹配通配符
+ * `%` 表达"始终显示全部数据库",系统库和之后新建的库都会保持可见。
*/
export function resolveVisibleDatabaseSaveAction(input: VisibleDatabaseSaveInput): VisibleDatabaseSaveAction {
const allNames = [...input.allNames];
@@ -31,15 +43,27 @@ export function resolveVisibleDatabaseSaveAction(input: VisibleDatabaseSaveInput
const configuredPatterns = normalizeVisibleDatabasePatterns(input.configuredPatterns ?? []);
const coversDefaultVisible = nextPatterns.length === 0 && sameSelection(selectedNames, input.defaultVisibleNames);
- const nextNames = coversDefaultVisible ? undefined : selectedNames;
- // 通配符存在时不能丢掉名单:两者取并集,名单缺失会让未命中通配符的库一起消失。
- const nextPatternValues = nextNames === undefined || nextPatterns.length === 0 ? undefined : nextPatterns;
+ const coversEveryName = sameSelection(selectedNames, allNames) && !sameSelection(allNames, input.defaultVisibleNames);
+
+ let nextNames: string[] | undefined;
+ let nextPatternValues: string[] | undefined;
+ if (coversDefaultVisible) {
+ nextNames = undefined;
+ nextPatternValues = undefined;
+ } else if (coversEveryName) {
+ nextNames = undefined;
+ nextPatternValues = [MATCH_ALL_VISIBLE_DATABASE_PATTERN];
+ } else {
+ // 通配符存在时不能丢掉名单:两者取并集,名单缺失会让未命中通配符的库一起消失。
+ nextNames = selectedNames;
+ nextPatternValues = nextPatterns.length > 0 ? nextPatterns : undefined;
+ }
if (sameOptionalSelection(nextNames, configuredNames) && sameOptionalSelection(nextPatternValues, configuredPatterns.length > 0 ? configuredPatterns : undefined)) {
return { type: "none" };
}
- if (nextNames === undefined) return { type: "clear" };
- return { type: "set", databaseNames: nextNames, patterns: nextPatterns };
+ if (nextNames === undefined && nextPatternValues === undefined) return { type: "clear" };
+ return { type: "set", databaseNames: nextNames, patterns: nextPatternValues ?? [] };
}
function normalizeVisibleDatabasePatterns(patterns: readonly string[]): string[] {
diff --git a/apps/desktop/src/lib/__tests__/connection/connectionVisibleDatabases.spec.ts b/apps/desktop/src/lib/__tests__/connection/connectionVisibleDatabases.spec.ts
new file mode 100644
index 0000000000..e93c8092ce
--- /dev/null
+++ b/apps/desktop/src/lib/__tests__/connection/connectionVisibleDatabases.spec.ts
@@ -0,0 +1,33 @@
+import { describe, expect, it } from "vitest";
+import { initialVisibleDatabaseSelection } from "@/lib/connection/connectionVisibleDatabases";
+import { MATCH_ALL_VISIBLE_DATABASE_PATTERN, filterDatabaseNamesForConnection } from "@/lib/database/visibleDatabases";
+
+describe("initialVisibleDatabaseSelection", () => {
+ it("lists the default non-system selection when no filter is configured", () => {
+ expect(initialVisibleDatabaseSelection(["app", "mysql", "sys"], undefined, { db_type: "mysql" })).toEqual(["app"]);
+ });
+
+ it("selects every database when the match-all pattern is persisted", () => {
+ const connection = { db_type: "mysql" as const, visible_database_patterns: [MATCH_ALL_VISIBLE_DATABASE_PATTERN] };
+ expect(initialVisibleDatabaseSelection(["app", "mysql", "sys"], undefined, connection)).toEqual(["app", "mysql", "sys"]);
+ });
+
+ it("unions an explicit selection with wildcard matches", () => {
+ const connection = { db_type: "mysql" as const, visible_database_patterns: ["log_%"] };
+ expect(initialVisibleDatabaseSelection(["app", "log_a", "mysql"], ["mysql"], connection)).toEqual(["log_a", "mysql"]);
+ });
+});
+
+describe("match-all visible database pattern (#12887)", () => {
+ it("keeps system databases and databases created later visible", () => {
+ const connection = { db_type: "mysql" as const, visible_database_patterns: [MATCH_ALL_VISIBLE_DATABASE_PATTERN] };
+ expect(filterDatabaseNamesForConnection(["app", "information_schema", "mysql", "sys", "new_db"], connection)).toEqual(["app", "information_schema", "mysql", "sys", "new_db"]);
+ });
+
+ it("keeps the picker selection after show-all and lists newly created databases", () => {
+ const names = ["information_schema", "mysql", "performance_schema", "sys", "app"];
+ const saved = { db_type: "mysql" as const, visible_databases: undefined, visible_database_patterns: [MATCH_ALL_VISIBLE_DATABASE_PATTERN] };
+ expect(filterDatabaseNamesForConnection([...names, "app_new"], saved)).toEqual([...names, "app_new"]);
+ expect(initialVisibleDatabaseSelection(names, undefined, saved)).toEqual(names);
+ });
+});
diff --git a/apps/desktop/src/lib/connection/connectionVisibleDatabases.ts b/apps/desktop/src/lib/connection/connectionVisibleDatabases.ts
index 5c4df2358d..0c68320625 100644
--- a/apps/desktop/src/lib/connection/connectionVisibleDatabases.ts
+++ b/apps/desktop/src/lib/connection/connectionVisibleDatabases.ts
@@ -1,5 +1,5 @@
import type { ConnectionConfig, DatabaseType } from "@/types/database";
-import { filterDatabaseNamesForVisiblePicker, normalizeVisibleDatabaseSelection } from "@/lib/database/visibleDatabases";
+import { filterDatabaseNamesForVisiblePicker, filterVisibleDatabaseNames, visibleDatabasePatternsAreEnabled } from "@/lib/database/visibleDatabases";
const DRAFT_VISIBLE_DATABASES_PREFIX = "__visible_draft_";
@@ -22,9 +22,12 @@ export function connectionCanChooseVisibleDatabases(connection: Pick<ConnectionC
return !!connection?.db_type && !UNSUPPORTED_VISIBLE_DATABASE_TYPES.has(connection.db_type);
}
-export function initialVisibleDatabaseSelection(databaseNames: string[], visibleDatabases: string[] | undefined, connection?: Pick<ConnectionConfig, "db_type" | "driver_profile" | "visible_databases">): string[] {
- if (Array.isArray(visibleDatabases)) {
- return normalizeVisibleDatabaseSelection(visibleDatabases, databaseNames);
+export function initialVisibleDatabaseSelection(databaseNames: string[], visibleDatabases: string[] | undefined, connection?: Pick<ConnectionConfig, "db_type" | "driver_profile" | "visible_databases" | "visible_database_patterns">): string[] {
+ const patterns = connection?.visible_database_patterns;
+ // 通配符与显式名单取并集,和侧栏筛选保持一致;全匹配通配符会让"显示全部"的选择器
+ // 重新打开时仍勾选所有库(含系统库),而不是看起来又退回默认视图。
+ if (Array.isArray(visibleDatabases) || visibleDatabasePatternsAreEnabled(patterns)) {
+ return filterVisibleDatabaseNames(databaseNames, visibleDatabases, patterns);
}
return filterDatabaseNamesForVisiblePicker(databaseNames, connection);
}
diff --git a/apps/desktop/src/lib/database/visibleDatabases.ts b/apps/desktop/src/lib/database/visibleDatabases.ts
index b56c15561f..35d48c3908 100644
--- a/apps/desktop/src/lib/database/visibleDatabases.ts
+++ b/apps/desktop/src/lib/database/visibleDatabases.ts
@@ -150,6 +150,12 @@ export function visibleDatabaseFilterIsEnabled(visibleDatabases: string[] | unde
return Array.isArray(visibleDatabases);
}
+/**
+ * 匹配全部库名的通配符。用于把“显示全部(含系统库)”持久化成动态过滤条件:
+ * 未配置筛选时系统库默认隐藏,而显式库名快照又会让之后新建的库无法自动出现。
+ */
+export const MATCH_ALL_VISIBLE_DATABASE_PATTERN = "%";
+
const visibleDatabasePatternRegExpCache = new Map<string, RegExp>();
/** SQL LIKE 语义:`%` 匹配任意字符序列、`_` 匹配单个字符,其余按字面匹配(区分大小写)。 */