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 }}