From 295c260a725390e933ef1d546ad99a8587468647 Mon Sep 17 00:00:00 2001 From: zipg Date: Sun, 9 Aug 2026 23:23:55 +0800 Subject: [PATCH] feat(connection): persist manually selected default schema --- apps/desktop/src/App.vue | 7 +- .../sidebar/SidebarTreeRuntimeHost.vue | 12 ++- .../src/components/sidebar/TreeItem.vue | 6 ++ .../TreeItem.loadMoreActivation.spec.ts | 1 + .../TreeItem.tableReferenceDrag.spec.ts | 1 + .../TreeItem.visibleFilterDetail.spec.ts | 1 + .../useSidebarConnectionMutationRuntime.ts | 24 +++++ apps/desktop/src/i18n/locales/en.ts | 3 + apps/desktop/src/i18n/locales/es.ts | 3 + apps/desktop/src/i18n/locales/it.ts | 3 + apps/desktop/src/i18n/locales/ja.ts | 3 + apps/desktop/src/i18n/locales/ko.ts | 3 + apps/desktop/src/i18n/locales/pt-BR.ts | 3 + apps/desktop/src/i18n/locales/zh-CN.ts | 3 + apps/desktop/src/i18n/locales/zh-TW.ts | 3 + .../connectionSchemaInitialization.spec.ts | 5 ++ .../lib/__tests__/sql/newQueryContext.spec.ts | 19 ++++ .../__tests__/connectionDatabaseInfo.spec.ts | 1 + .../lib/connection/connectionDatabaseInfo.ts | 2 +- .../schema/connectionSchemaInitialization.ts | 3 +- apps/desktop/src/lib/sql/newQueryContext.ts | 7 +- .../connectionStore.defaultSchema.spec.ts | 89 +++++++++++++++++++ apps/desktop/src/stores/connectionStore.ts | 29 ++++++ apps/desktop/src/types/database.ts | 1 + .../examples/table_import_live_bench.rs | 1 + crates/dbx-core/src/agent_connection.rs | 1 + crates/dbx-core/src/agent_tools.rs | 1 + crates/dbx-core/src/cloud_sync.rs | 3 + crates/dbx-core/src/connection.rs | 1 + crates/dbx-core/src/connection_secrets.rs | 1 + crates/dbx-core/src/db/redis_driver.rs | 1 + crates/dbx-core/src/models/connection.rs | 28 ++++++ crates/dbx-core/src/mq/config.rs | 1 + crates/dbx-core/src/mq/service.rs | 1 + crates/dbx-core/src/nacos/config.rs | 1 + crates/dbx-core/src/nacos/service.rs | 2 + crates/dbx-core/src/production_safety.rs | 1 + crates/dbx-core/src/query.rs | 2 + crates/dbx-core/src/schema.rs | 1 + crates/dbx-core/src/schema/normalization.rs | 1 + crates/dbx-core/src/storage.rs | 2 + crates/dbx-core/src/transfer.rs | 1 + .../tests/database_export_prefetch.rs | 1 + crates/dbx-core/tests/dump_docs_fixture.rs | 1 + .../tests/live_postgres_docs_annotations.rs | 1 + .../tests/live_postgres_docs_snapshot.rs | 1 + .../live_postgres_query_result_export.rs | 1 + .../dbx-core/tests/live_postgres_transfer.rs | 1 + .../tests/live_sqlserver_completion.rs | 1 + .../live_sqlserver_query_result_export.rs | 1 + crates/dbx-web/src/routes/connection.rs | 1 + crates/dbx-web/src/routes/transfer.rs | 1 + src-tauri/src/commands/connection.rs | 1 + 53 files changed, 284 insertions(+), 9 deletions(-) create mode 100644 apps/desktop/src/stores/__tests__/connectionStore.defaultSchema.spec.ts diff --git a/apps/desktop/src/App.vue b/apps/desktop/src/App.vue index b2591d9614..c5f2bff85f 100644 --- a/apps/desktop/src/App.vue +++ b/apps/desktop/src/App.vue @@ -1759,10 +1759,11 @@ async function changeActiveConnection(connectionId: string) { const options = await getDatabaseOptions(connectionId); const database = resolveDefaultDatabase(connection, options); queryStore.updateDatabase(tab.id, database); - if (connection.db_type === "oracle") { + if (connection.default_schema || connection.db_type === "oracle") { try { - // Oracle returns the session's current schema first; preserve that order before toolbar sorting. - const schema = schemaAfterConnectionSwitch(connection.db_type, await api.listSchemas(connectionId, database)); + // A configured default wins. Otherwise Oracle returns the session's current schema first. + const orderedSchemas = connection.default_schema ? [] : await api.listSchemas(connectionId, database); + const schema = schemaAfterConnectionSwitch(connection.db_type, orderedSchemas, connection.default_schema); if (schema && activeTab.value?.id === tab.id && activeTab.value.connectionId === connectionId) { queryStore.updateSchema(tab.id, schema); } diff --git a/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue b/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue index 8fac961927..8199e1b2f1 100644 --- a/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue +++ b/apps/desktop/src/components/sidebar/SidebarTreeRuntimeHost.vue @@ -347,6 +347,8 @@ const emit = defineEmits<{ const { setNodeAsDefaultDatabase, clearNodeDefaultDatabase, + setNodeAsDefaultSchema, + clearNodeDefaultSchema, connectionDeleteMenuLabel, connectionDuplicateMenuLabel, connectionDeleteConfirmMessage, @@ -364,6 +366,7 @@ const { closeDatabaseConnection, isPinned, isNodeDefaultDatabase, + isNodeDefaultSchema, isConnected, isConnecting, canCloseDatabaseConnection, @@ -1248,7 +1251,7 @@ async function newQuery() { const connection = connectionStore.getConfig(node.connectionId); if (!connection) return; const options = await getDatabaseOptions(node.connectionId); - queryStore.createTab(node.connectionId, resolveDefaultDatabase(connection, options), undefined, "query"); + queryStore.createTab(node.connectionId, resolveDefaultDatabase(connection, options), undefined, "query", connection.default_schema); } catch (e: any) { toast(t("connection.connectFailed", { message: translateBackendError(t, e) }), 5000); openDriverStoreForInstallError(e?.message || String(e)); @@ -4179,6 +4182,13 @@ function buildDatabaseSidebarMenu(context: SidebarMenuFactoryContext): boolean { items.push({ label: t("contextMenu.clearDefaultDatabase"), action: clearNodeDefaultDatabase, icon: Database }); } } + if (node.type === "schema") { + if (!isNodeDefaultSchema.value) { + items.push({ label: t("contextMenu.setDefaultSchema"), action: setNodeAsDefaultSchema, icon: Database }); + } else { + items.push({ label: t("contextMenu.clearDefaultSchema"), action: clearNodeDefaultSchema, icon: Database }); + } + } if (canEditDatabaseProperties.value) { items.push({ label: t("contextMenu.editDatabaseProperties"), action: openEditDatabasePropertiesDialog, icon: SquarePen }); } diff --git a/apps/desktop/src/components/sidebar/TreeItem.vue b/apps/desktop/src/components/sidebar/TreeItem.vue index 36a310e9d4..8004b9a78f 100644 --- a/apps/desktop/src/components/sidebar/TreeItem.vue +++ b/apps/desktop/src/components/sidebar/TreeItem.vue @@ -566,6 +566,9 @@ const isNodeDefaultDatabase = computed( typeof activeNode.value.database === "string" && connectionStore.isDefaultDatabase(activeNode.value.connectionId, activeNode.value.database), ); +function isNodeDefaultSchema(): boolean { + return activeNode.value.type === "schema" && !!activeNode.value.connectionId && !!activeNode.value.schema && connectionStore.isDefaultSchema(activeNode.value.connectionId, activeNode.value.schema); +} const trailingComment = computed(() => { if (!settingsStore.editorSettings.sidebarObjectInfoMode.startsWith("comment-")) return null; @@ -1212,6 +1215,9 @@ function onKeydown(event: KeyboardEvent) { {{ t("editor.defaultDatabase") }} + + {{ t("editor.defaultSchema") }} + {{ trailingComment }}