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") }}
+
diff --git a/apps/desktop/src/components/sidebar/__tests__/TreeItem.loadMoreActivation.spec.ts b/apps/desktop/src/components/sidebar/__tests__/TreeItem.loadMoreActivation.spec.ts
index 65beaf6909..b3f0c26892 100644
--- a/apps/desktop/src/components/sidebar/__tests__/TreeItem.loadMoreActivation.spec.ts
+++ b/apps/desktop/src/components/sidebar/__tests__/TreeItem.loadMoreActivation.spec.ts
@@ -15,6 +15,7 @@ const connectionStore = {
connections: [],
getConfig: () => ({ id: "connection-1", db_type: "sqlserver" }),
isDefaultDatabase: () => false,
+ isDefaultSchema: () => false,
isPinnedTreeNodeReorderTarget: () => false,
isTreeNodeChildrenLoaded: () => false,
isTreeNodePinned: () => false,
diff --git a/apps/desktop/src/components/sidebar/__tests__/TreeItem.tableReferenceDrag.spec.ts b/apps/desktop/src/components/sidebar/__tests__/TreeItem.tableReferenceDrag.spec.ts
index f18bd47be7..a786f4aa2d 100644
--- a/apps/desktop/src/components/sidebar/__tests__/TreeItem.tableReferenceDrag.spec.ts
+++ b/apps/desktop/src/components/sidebar/__tests__/TreeItem.tableReferenceDrag.spec.ts
@@ -16,6 +16,7 @@ const connectionStore = {
connections: [],
getConfig: () => ({ id: "connection-1", db_type: "sqlite" }),
isDefaultDatabase: () => false,
+ isDefaultSchema: () => false,
isPinnedTreeNodeReorderTarget: () => false,
isTreeNodeChildrenLoaded: () => false,
isTreeNodePinned: () => false,
diff --git a/apps/desktop/src/components/sidebar/__tests__/TreeItem.visibleFilterDetail.spec.ts b/apps/desktop/src/components/sidebar/__tests__/TreeItem.visibleFilterDetail.spec.ts
index dd6c505e4e..c8cb848e52 100644
--- a/apps/desktop/src/components/sidebar/__tests__/TreeItem.visibleFilterDetail.spec.ts
+++ b/apps/desktop/src/components/sidebar/__tests__/TreeItem.visibleFilterDetail.spec.ts
@@ -40,6 +40,7 @@ const connectionStore = {
getSidebarVisibleFilterSummary: () => state.summary,
clearConnectionError: vi.fn(),
isDefaultDatabase: () => false,
+ isDefaultSchema: () => false,
isPinnedTreeNodeReorderTarget: () => false,
isTreeNodeChildrenLoaded: () => false,
isTreeNodePinned: () => false,
diff --git a/apps/desktop/src/composables/useSidebarConnectionMutationRuntime.ts b/apps/desktop/src/composables/useSidebarConnectionMutationRuntime.ts
index bac37b95b2..6e3ccaf254 100644
--- a/apps/desktop/src/composables/useSidebarConnectionMutationRuntime.ts
+++ b/apps/desktop/src/composables/useSidebarConnectionMutationRuntime.ts
@@ -55,6 +55,26 @@ export function useSidebarConnectionMutationRuntime(options: SidebarConnectionMu
}
}
+ async function setNodeAsDefaultSchema() {
+ const node = activeNode.value;
+ if (!node.connectionId || !node.schema) return;
+ try {
+ await connectionStore.setDefaultSchema(node.connectionId, node.schema);
+ } catch (error: any) {
+ toast(t("connection.saveFailed", { message: error?.message || String(error) }), 5000);
+ }
+ }
+
+ async function clearNodeDefaultSchema() {
+ const node = activeNode.value;
+ if (!node.connectionId) return;
+ try {
+ await connectionStore.clearDefaultSchema(node.connectionId);
+ } catch (error: any) {
+ toast(t("connection.saveFailed", { message: error?.message || String(error) }), 5000);
+ }
+ }
+
function connectionDeleteTargets() {
if (showDeleteConfirm.value && connectionDeleteTargetSnapshot.value.length) return connectionDeleteTargetSnapshot.value;
return selectedConnectionDeleteTargets(activeNode.value, selectedTreeNodesInVisibleOrder());
@@ -229,6 +249,7 @@ export function useSidebarConnectionMutationRuntime(options: SidebarConnectionMu
const isNodeDefaultDatabase = computed(
() => (activeNode.value.type === "database" || activeNode.value.type === "redis-db" || activeNode.value.type === "mongo-db") && !!activeNode.value.connectionId && !!activeNode.value.database && connectionStore.isDefaultDatabase(activeNode.value.connectionId, activeNode.value.database),
);
+ const isNodeDefaultSchema = computed(() => activeNode.value.type === "schema" && !!activeNode.value.connectionId && !!activeNode.value.schema && connectionStore.isDefaultSchema(activeNode.value.connectionId, activeNode.value.schema));
const isConnected = computed(() => activeNode.value.type === "connection" && !!activeNode.value.connectionId && connectionStore.connectedIds.has(activeNode.value.connectionId));
const isConnecting = computed(() => activeNode.value.type === "connection" && !!activeNode.value.connectionId && connectionStore.connectingIds.has(activeNode.value.connectionId));
const canCloseDatabaseConnection = computed(() => canCloseSidebarDatabaseConnection(activeNode.value, connectionStore.isTreeNodeChildrenLoaded, (connectionId, database) => queryStore.openDatabaseKeys.has(`${connectionId}\x00${database}`)));
@@ -290,6 +311,8 @@ export function useSidebarConnectionMutationRuntime(options: SidebarConnectionMu
return {
setNodeAsDefaultDatabase,
clearNodeDefaultDatabase,
+ setNodeAsDefaultSchema,
+ clearNodeDefaultSchema,
connectionDeleteTargets,
connectionDeleteMenuLabel,
connectionDuplicateTargets,
@@ -310,6 +333,7 @@ export function useSidebarConnectionMutationRuntime(options: SidebarConnectionMu
closeDatabaseConnection,
isPinned,
isNodeDefaultDatabase,
+ isNodeDefaultSchema,
isConnected,
isConnecting,
canCloseDatabaseConnection,
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 110aa158cd..84faf6ec74 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -981,6 +981,7 @@ export default {
searchSchema: "Search schemas...",
setDefaultDatabase: "Set Default",
defaultDatabase: "Default",
+ defaultSchema: "Default",
clearDatabase: "Clear database",
exPasteNoValues: "Clipboard has no values for an IN condition",
exPasteNotList: "No convertible multi-value list was detected",
@@ -2390,6 +2391,8 @@ export default {
finalProxyPortCopied: "Final proxy port {port} copied",
setDefaultDatabase: "Set as Default Database",
clearDefaultDatabase: "Clear Default Database",
+ setDefaultSchema: "Set as Default Schema",
+ clearDefaultSchema: "Clear Default Schema",
exportDatabase: "Export Database",
exportAllDatabases: "Export All Databases",
exportDatabaseSuccess: "Exported {count} tables, up to {limit} rows each",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 5b4b784c6b..49f009bee1 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -958,6 +958,7 @@ export default withEnglishFallback({
searchSchema: "Buscar esquemas...",
setDefaultDatabase: "Establecer como predeterminada",
defaultDatabase: "Predeterminada",
+ defaultSchema: "Predeterminado",
clearDatabase: "Limpiar base de datos",
exPasteNoValues: "El portapapeles no contiene valores para una condición IN",
exPasteNotList: "No se detectó una lista de varios valores convertible",
@@ -2328,6 +2329,8 @@ export default withEnglishFallback({
finalProxyPortCopied: "Puerto proxy final {port} copiado",
setDefaultDatabase: "Establecer como base de datos predeterminada",
clearDefaultDatabase: "Limpiar base de datos predeterminada",
+ setDefaultSchema: "Establecer como esquema predeterminado",
+ clearDefaultSchema: "Limpiar esquema predeterminado",
exportDatabase: "Exportar base de datos",
exportAllDatabases: "Exportar todas las bases de datos",
exportDatabaseSuccess: "Se exportaron {count} tablas, hasta {limit} filas cada una",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index b8a95df6c2..58b014460c 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -956,6 +956,7 @@ export default withEnglishFallback({
searchSchema: "Cerca schemi...",
setDefaultDatabase: "Imposta Predefinito",
defaultDatabase: "Predefinito",
+ defaultSchema: "Predefinito",
clearDatabase: "Cancella database",
exPasteNoValues: "Gli appunti non contengono valori per una condizione IN",
exPasteNotList: "Nessun elenco di più valori convertibile rilevato",
@@ -2326,6 +2327,8 @@ export default withEnglishFallback({
finalProxyPortCopied: "Porta proxy finale {port} copiata",
setDefaultDatabase: "Imposta come Database Predefinito",
clearDefaultDatabase: "Cancella Database Predefinito",
+ setDefaultSchema: "Imposta come Schema Predefinito",
+ clearDefaultSchema: "Cancella Schema Predefinito",
exportDatabase: "Esporta Database",
exportAllDatabases: "Esporta tutti i database",
exportDatabaseSuccess: "Esportate {count} tabelle, fino a {limit} righe ciascuna",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index d689309b47..addef60a0f 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -976,6 +976,7 @@ export default withEnglishFallback({
searchSchema: "スキーマを検索...",
setDefaultDatabase: "デフォルトに設定",
defaultDatabase: "デフォルト",
+ defaultSchema: "デフォルト",
clearDatabase: "データベースをクリア",
exPasteNoValues: "クリップボードにIN条件で使える値がありません",
exPasteNotList: "変換可能な複数値リストを検出できませんでした",
@@ -2351,6 +2352,8 @@ export default withEnglishFallback({
finalProxyPortCopied: "最終プロキシポート {port} をコピーしました",
setDefaultDatabase: "デフォルトデータベースに設定",
clearDefaultDatabase: "デフォルトデータベースをクリア",
+ setDefaultSchema: "デフォルトスキーマに設定",
+ clearDefaultSchema: "デフォルトスキーマをクリア",
exportDatabase: "データベースをエクスポート",
exportAllDatabases: "すべてのデータベースをエクスポート",
exportDatabaseSuccess: "{count}テーブルをエクスポートしました(各{limit}行まで)",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index f7f8fde301..7c4880aa9f 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -875,6 +875,7 @@ export default withEnglishFallback({
searchSchema: "스키마 검색...",
setDefaultDatabase: "기본값으로 설정",
defaultDatabase: "기본",
+ defaultSchema: "기본",
clearDatabase: "데이터베이스 지우기",
exPasteNoValues: "클립보드에 IN 조건에 사용할 값이 없습니다",
exPasteNotList: "변환 가능한 다중 값 목록이 감지되지 않았습니다",
@@ -2246,6 +2247,8 @@ export default withEnglishFallback({
finalProxyPortCopied: "최종 프록시 포트 {port} 복사됨",
setDefaultDatabase: "기본 데이터베이스로 설정",
clearDefaultDatabase: "기본 데이터베이스 지우기",
+ setDefaultSchema: "기본 스키마로 설정",
+ clearDefaultSchema: "기본 스키마 지우기",
exportDatabase: "데이터베이스 내보내기",
exportAllDatabases: "모든 데이터베이스 내보내기",
exportDatabaseSuccess: "테이블 {count}개 내보냄, 각각 최대 {limit}행",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index 4dec01e1aa..9782437e26 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -957,6 +957,7 @@ export default withEnglishFallback({
searchSchema: "Pesquisar schemas...",
setDefaultDatabase: "Definir Padrão",
defaultDatabase: "Padrão",
+ defaultSchema: "Padrão",
clearDatabase: "Limpar banco de dados",
exPasteNoValues: "A área de transferência não contém valores para uma condição IN",
exPasteNotList: "Nenhuma lista de múltiplos valores conversível foi detectada",
@@ -2328,6 +2329,8 @@ export default withEnglishFallback({
copyName: "Copiar Nome",
setDefaultDatabase: "Definir como Banco de Dados Padrão",
clearDefaultDatabase: "Limpar Banco de Dados Padrão",
+ setDefaultSchema: "Definir como Schema Padrão",
+ clearDefaultSchema: "Limpar Schema Padrão",
exportDatabase: "Exportar Banco de Dados",
exportAllDatabases: "Exportar todos os bancos de dados",
exportDatabaseSuccess: "{count} tabelas exportadas, até {limit} linhas cada",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index 45ccceac21..5a810dc416 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -981,6 +981,7 @@ export default withEnglishFallback({
searchSchema: "搜索模式...",
setDefaultDatabase: "设为默认",
defaultDatabase: "默认库",
+ defaultSchema: "默认 Schema",
clearDatabase: "清除数据库选择",
exPasteNoValues: "剪贴板中没有可用于 IN 条件的值",
exPasteNotList: "未识别到可转换的多值列表",
@@ -2390,6 +2391,8 @@ export default withEnglishFallback({
finalProxyPortCopied: "最终代理端口 {port} 已复制",
setDefaultDatabase: "设为默认数据库",
clearDefaultDatabase: "取消默认数据库",
+ setDefaultSchema: "设为默认 Schema",
+ clearDefaultSchema: "取消默认 Schema",
exportDatabase: "导出数据库",
exportAllDatabases: "导出全部数据库",
exportDatabaseSuccess: "已导出 {count} 张表,每表最多 {limit} 行",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index ab5412cd51..a6adde7948 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -956,6 +956,7 @@ export default withEnglishFallback({
searchSchema: "搜尋 Schema...",
setDefaultDatabase: "設為預設",
defaultDatabase: "預設資料庫",
+ defaultSchema: "預設 Schema",
clearDatabase: "清除資料庫",
exPasteNoValues: "剪貼簿中沒有可用於 IN 條件的值",
exPasteNotList: "未識別到可轉換的多值列表",
@@ -2327,6 +2328,8 @@ export default withEnglishFallback({
finalProxyPortCopied: "最終代理連接埠 {port} 已複製",
setDefaultDatabase: "設為預設資料庫",
clearDefaultDatabase: "取消預設資料庫",
+ setDefaultSchema: "設為預設 Schema",
+ clearDefaultSchema: "取消預設 Schema",
exportDatabase: "匯出資料庫",
exportAllDatabases: "匯出全部資料庫",
exportDatabaseSuccess: "已匯出 {count} 張資料表,每張最多 {limit} 行",
diff --git a/apps/desktop/src/lib/__tests__/schema/connectionSchemaInitialization.spec.ts b/apps/desktop/src/lib/__tests__/schema/connectionSchemaInitialization.spec.ts
index e6e10b1d65..1ea79c96fd 100644
--- a/apps/desktop/src/lib/__tests__/schema/connectionSchemaInitialization.spec.ts
+++ b/apps/desktop/src/lib/__tests__/schema/connectionSchemaInitialization.spec.ts
@@ -9,4 +9,9 @@ describe("schemaAfterConnectionSwitch", () => {
it("does not initialize schemas for non-Oracle connections", () => {
expect(schemaAfterConnectionSwitch("postgres", ["public", "archive"])).toBeUndefined();
});
+
+ it("prefers a configured default schema for PostgreSQL and Oracle", () => {
+ expect(schemaAfterConnectionSwitch("postgres", ["public", "archive"], "archive")).toBe("archive");
+ expect(schemaAfterConnectionSwitch("oracle", ["CONNECTED_USER", "APP"], "APP")).toBe("APP");
+ });
});
diff --git a/apps/desktop/src/lib/__tests__/sql/newQueryContext.spec.ts b/apps/desktop/src/lib/__tests__/sql/newQueryContext.spec.ts
index 81f45b57d7..b2e1a6309e 100644
--- a/apps/desktop/src/lib/__tests__/sql/newQueryContext.spec.ts
+++ b/apps/desktop/src/lib/__tests__/sql/newQueryContext.spec.ts
@@ -87,6 +87,25 @@ describe("resolveNewQueryTarget", () => {
})?.database,
).toBe("analytics.db");
});
+
+ it("uses the configured default schema when no explicit schema context exists", () => {
+ expect(
+ resolveNewQueryTarget({
+ activeConnectionId: "conn-1",
+ connections: [{ id: "conn-1", host: "localhost", database: "app", default_schema: "archive", db_type: "postgres" }],
+ }),
+ ).toMatchObject({ connectionId: "conn-1", database: "app", schema: "archive" });
+ });
+
+ it("keeps an explicitly selected schema ahead of the configured default", () => {
+ expect(
+ resolveNewQueryTarget({
+ selectedTreeNode: { connectionId: "conn-1", database: "app", schema: "reporting" },
+ connections: [{ id: "conn-1", host: "localhost", database: "app", default_schema: "archive", db_type: "postgres" }],
+ preferredSource: "sidebar",
+ })?.schema,
+ ).toBe("reporting");
+ });
});
describe("resolveNewQueryTable", () => {
diff --git a/apps/desktop/src/lib/connection/__tests__/connectionDatabaseInfo.spec.ts b/apps/desktop/src/lib/connection/__tests__/connectionDatabaseInfo.spec.ts
index 3e9c08c883..1461251b74 100644
--- a/apps/desktop/src/lib/connection/__tests__/connectionDatabaseInfo.spec.ts
+++ b/apps/desktop/src/lib/connection/__tests__/connectionDatabaseInfo.spec.ts
@@ -66,6 +66,7 @@ describe("connectionDatabaseInfo", () => {
expect(connectionConfigFingerprint(original, "")).not.toBe(connectionConfigFingerprint(original, original.name));
expect(connectionConfigFingerprint({ ...original, database_info: { productName: "MySQL", productVersion: "8.4.0" } })).toBe(connectionConfigFingerprint(original));
expect(connectionConfigFingerprint({ ...original, note: "Production reporting" })).toBe(connectionConfigFingerprint(original));
+ expect(connectionConfigFingerprint({ ...original, default_schema: "archive" })).toBe(connectionConfigFingerprint(original));
});
it("formats only database metadata for rows and copied text", () => {
diff --git a/apps/desktop/src/lib/connection/connectionDatabaseInfo.ts b/apps/desktop/src/lib/connection/connectionDatabaseInfo.ts
index 7bac8dfd4e..4fc1b8266c 100644
--- a/apps/desktop/src/lib/connection/connectionDatabaseInfo.ts
+++ b/apps/desktop/src/lib/connection/connectionDatabaseInfo.ts
@@ -86,7 +86,7 @@ function fnv1a(value: string, seed: number): number {
}
export function connectionConfigFingerprint(config: ConnectionConfig, sourceName = config.name): string {
- const { database_info: _databaseInfo, note: _note, ...submittedConfig } = config;
+ const { database_info: _databaseInfo, default_schema: _defaultSchema, note: _note, ...submittedConfig } = config;
const serialized = JSON.stringify(stableValue({ config: submittedConfig, sourceName }));
const first = fnv1a(serialized, 0x811c9dc5).toString(16).padStart(8, "0");
const second = fnv1a(serialized, 0x9e3779b9).toString(16).padStart(8, "0");
diff --git a/apps/desktop/src/lib/schema/connectionSchemaInitialization.ts b/apps/desktop/src/lib/schema/connectionSchemaInitialization.ts
index 08a112f621..1731f053bc 100644
--- a/apps/desktop/src/lib/schema/connectionSchemaInitialization.ts
+++ b/apps/desktop/src/lib/schema/connectionSchemaInitialization.ts
@@ -1,6 +1,7 @@
import type { DatabaseType } from "@/types/database";
-export function schemaAfterConnectionSwitch(databaseType: DatabaseType | undefined, orderedSchemaNames: string[]): string | undefined {
+export function schemaAfterConnectionSwitch(databaseType: DatabaseType | undefined, orderedSchemaNames: string[], configuredDefaultSchema?: string): string | undefined {
+ if (configuredDefaultSchema?.trim()) return configuredDefaultSchema.trim();
if (databaseType !== "oracle") return undefined;
return orderedSchemaNames[0];
}
diff --git a/apps/desktop/src/lib/sql/newQueryContext.ts b/apps/desktop/src/lib/sql/newQueryContext.ts
index 86f2a7ef90..2da940d6e3 100644
--- a/apps/desktop/src/lib/sql/newQueryContext.ts
+++ b/apps/desktop/src/lib/sql/newQueryContext.ts
@@ -17,7 +17,7 @@ interface ResolveNewQueryTargetInput {
activeTab?: Pick;
selectedTreeNode?: Pick | null;
activeConnectionId?: string | null;
- connections: Pick[];
+ connections: Pick[];
preferredSource?: NewQueryContextSource;
}
@@ -45,6 +45,7 @@ export function resolveNewQueryTarget(input: ResolveNewQueryTargetInput): NewQue
? {
connectionId: fallbackConnection.id,
database: resolveDefaultDatabase(fallbackConnection, []),
+ schema: fallbackConnection.default_schema,
shouldRefreshDefaultDatabase: true,
}
: null;
@@ -52,7 +53,7 @@ export function resolveNewQueryTarget(input: ResolveNewQueryTargetInput): NewQue
function targetFromContext(
context: Pick | Pick | undefined,
- connections: Pick[],
+ connections: Pick[],
): NewQueryTarget | null {
if (!context?.connectionId) return null;
const connection = connections.find((item) => item.id === context.connectionId);
@@ -64,7 +65,7 @@ function targetFromContext(
return {
connectionId: context.connectionId,
database,
- schema: context.schema ?? objectBrowser?.schema ?? tableMeta?.schema,
+ schema: context.schema ?? objectBrowser?.schema ?? tableMeta?.schema ?? connection.default_schema,
catalog: context.catalog ?? objectBrowser?.catalog ?? tableMeta?.catalog,
shouldRefreshDefaultDatabase: !context.database,
};
diff --git a/apps/desktop/src/stores/__tests__/connectionStore.defaultSchema.spec.ts b/apps/desktop/src/stores/__tests__/connectionStore.defaultSchema.spec.ts
new file mode 100644
index 0000000000..ffd540c1fb
--- /dev/null
+++ b/apps/desktop/src/stores/__tests__/connectionStore.defaultSchema.spec.ts
@@ -0,0 +1,89 @@
+import { createPinia, setActivePinia } from "pinia";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { ConnectionConfig, TreeNode } from "@/types/database";
+
+function installLocalStorage() {
+ const data = new Map();
+ vi.stubGlobal("localStorage", {
+ getItem: vi.fn((key: string) => data.get(key) ?? null),
+ setItem: vi.fn((key: string, value: string) => data.set(key, value)),
+ removeItem: vi.fn((key: string) => data.delete(key)),
+ });
+}
+
+function postgresConnection(): ConnectionConfig {
+ return {
+ id: "postgres-1",
+ name: "PostgreSQL",
+ db_type: "postgres",
+ host: "127.0.0.1",
+ port: 5432,
+ username: "postgres",
+ password: "",
+ database: "app",
+ };
+}
+
+describe("connectionStore default schema", () => {
+ beforeEach(() => {
+ vi.resetModules();
+ vi.unstubAllGlobals();
+ installLocalStorage();
+ setActivePinia(createPinia());
+ });
+
+ it("persists set and clear, keeps the connection active, and orders the default schema first", async () => {
+ const saveConnections = vi.fn().mockResolvedValue(undefined);
+ vi.doMock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => false }));
+ vi.doMock("@/lib/backend/api", () => ({
+ deleteSchemaCachePrefix: vi.fn().mockResolvedValue(undefined),
+ loadSchemaCache: vi.fn().mockResolvedValue(null),
+ saveConnections,
+ saveSchemaCache: vi.fn().mockResolvedValue(undefined),
+ saveSidebarLayout: vi.fn().mockResolvedValue(undefined),
+ }));
+
+ const { useConnectionStore } = await import("@/stores/connectionStore");
+ const store = useConnectionStore();
+ const connection = postgresConnection();
+ store.addEphemeralConnection(connection);
+ store.sidebarLayout = { groups: [], order: [{ type: "connection", id: connection.id }] };
+ store.treeNodes = [
+ {
+ id: connection.id,
+ label: connection.name,
+ type: "connection",
+ connectionId: connection.id,
+ children: [
+ {
+ id: `${connection.id}:${connection.database}`,
+ label: connection.database!,
+ type: "database",
+ connectionId: connection.id,
+ database: connection.database,
+ children: [
+ { id: "schema-archive", label: "archive", type: "schema", connectionId: connection.id, database: connection.database, schema: "archive" },
+ { id: "schema-public", label: "public", type: "schema", connectionId: connection.id, database: connection.database, schema: "public" },
+ ],
+ },
+ ],
+ },
+ ];
+ const schemaLabels = () => (store.treeNodes[0]?.children?.[0]?.children || []).filter((node: TreeNode) => node.type === "schema").map((node: TreeNode) => node.label);
+
+ await store.setDefaultSchema(connection.id, " public ");
+
+ expect(store.getConfig(connection.id)?.default_schema).toBe("public");
+ expect(store.isDefaultSchema(connection.id, "public")).toBe(true);
+ expect(store.connectedIds.has(connection.id)).toBe(true);
+ expect(schemaLabels()).toEqual(["public", "archive"]);
+ expect(saveConnections).toHaveBeenLastCalledWith([expect.objectContaining({ id: connection.id, default_schema: "public" })]);
+
+ await store.clearDefaultSchema(connection.id);
+
+ expect(store.getConfig(connection.id)?.default_schema).toBeUndefined();
+ expect(store.connectedIds.has(connection.id)).toBe(true);
+ expect(schemaLabels()).toEqual(["archive", "public"]);
+ expect(saveConnections).toHaveBeenLastCalledWith([expect.objectContaining({ id: connection.id, default_schema: undefined })]);
+ });
+});
diff --git a/apps/desktop/src/stores/connectionStore.ts b/apps/desktop/src/stores/connectionStore.ts
index 1ea59ce837..bbe1de8270 100644
--- a/apps/desktop/src/stores/connectionStore.ts
+++ b/apps/desktop/src/stores/connectionStore.ts
@@ -1144,6 +1144,9 @@ export const useConnectionStore = defineStore("connection", () => {
}
function isFixedPriorityTreeNode(node: TreeNode): boolean {
+ if (node.type === "schema") {
+ return !!node.connectionId && !!node.schema && isDefaultSchema(node.connectionId, node.schema);
+ }
if (node.type !== "database" && node.type !== "redis-db" && node.type !== "mongo-db") return false;
return !!node.connectionId && typeof node.database === "string" && isDefaultDatabase(node.connectionId, node.database);
}
@@ -2557,6 +2560,29 @@ export const useConnectionStore = defineStore("connection", () => {
return config?.database === database && database !== "";
}
+ async function setDefaultSchema(connectionId: string, schema: string) {
+ const config = getConfig(connectionId);
+ const defaultSchema = schema.trim();
+ if (!config || !defaultSchema || config.default_schema === defaultSchema) return;
+ await updateConnection({
+ ...config,
+ default_schema: defaultSchema,
+ });
+ }
+
+ async function clearDefaultSchema(connectionId: string) {
+ const config = getConfig(connectionId);
+ if (!config?.default_schema) return;
+ await updateConnection({
+ ...config,
+ default_schema: undefined,
+ });
+ }
+
+ function isDefaultSchema(connectionId: string, schema: string): boolean {
+ return getConfig(connectionId)?.default_schema === schema && schema !== "";
+ }
+
function getRedisDatabaseAlias(connectionId: string, database: string | number): string | undefined {
return redisDatabaseAlias(getConfig(connectionId)?.redis_database_aliases, database);
}
@@ -7084,6 +7110,9 @@ export const useConnectionStore = defineStore("connection", () => {
setDefaultDatabase,
clearDefaultDatabase,
isDefaultDatabase,
+ setDefaultSchema,
+ clearDefaultSchema,
+ isDefaultSchema,
getRedisDatabaseAlias,
setRedisDatabaseAlias,
setVisibleDatabases,
diff --git a/apps/desktop/src/types/database.ts b/apps/desktop/src/types/database.ts
index 63e501529f..2ed3409db3 100644
--- a/apps/desktop/src/types/database.ts
+++ b/apps/desktop/src/types/database.ts
@@ -139,6 +139,7 @@ export interface ConnectionConfig {
username: string;
password: string;
database?: string;
+ default_schema?: string;
visible_databases?: string[];
visible_schemas?: Record;
show_system_schemas?: boolean;
diff --git a/crates/dbx-core/examples/table_import_live_bench.rs b/crates/dbx-core/examples/table_import_live_bench.rs
index 8bcecc4fd8..651107286d 100644
--- a/crates/dbx-core/examples/table_import_live_bench.rs
+++ b/crates/dbx-core/examples/table_import_live_bench.rs
@@ -168,6 +168,7 @@ fn connection_config(id: &str, database: BenchDatabase) -> Result,
#[serde(default, skip_serializing_if = "Option::is_none")]
+ pub default_schema: Option,
+ #[serde(default, skip_serializing_if = "Option::is_none")]
pub visible_databases: Option>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub visible_schemas: Option>>,
@@ -578,6 +580,8 @@ struct ConnectionConfigData {
pub password: String,
pub database: Option,
#[serde(default)]
+ pub default_schema: Option,
+ #[serde(default)]
pub visible_databases: Option>,
#[serde(default)]
pub visible_schemas: Option>>,
@@ -675,6 +679,7 @@ impl From for ConnectionConfig {
username: data.username,
password: data.password,
database: data.database,
+ default_schema: data.default_schema,
visible_databases: data.visible_databases,
visible_schemas: data.visible_schemas,
show_system_schemas: data.show_system_schemas,
@@ -2282,6 +2287,28 @@ mod tests {
assert_eq!(database_info_from_protocol_value(&serde_json::json!({ "ok": true })), None);
}
+ #[test]
+ fn default_schema_is_optional_and_round_trips() {
+ let base = serde_json::json!({
+ "id": "id",
+ "name": "PostgreSQL",
+ "db_type": "postgres",
+ "host": "localhost",
+ "port": 5432,
+ "username": "postgres",
+ "password": "",
+ "database": "app"
+ });
+ let legacy: ConnectionConfig = serde_json::from_value(base.clone()).unwrap();
+ assert_eq!(legacy.default_schema, None);
+
+ let mut configured = base;
+ configured["default_schema"] = serde_json::json!("archive");
+ let parsed: ConnectionConfig = serde_json::from_value(configured).unwrap();
+ assert_eq!(parsed.default_schema.as_deref(), Some("archive"));
+ assert_eq!(serde_json::to_value(parsed).unwrap()["default_schema"], "archive");
+ }
+
fn mysql_config(username: &str, password: &str, database: Option<&str>) -> ConnectionConfig {
ConnectionConfig {
docs_notes_path: None,
@@ -2298,6 +2325,7 @@ mod tests {
username: username.to_string(),
password: password.to_string(),
database: database.map(str::to_string),
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,
diff --git a/crates/dbx-core/src/mq/config.rs b/crates/dbx-core/src/mq/config.rs
index 3fb2afb6e6..0105c8dc6b 100644
--- a/crates/dbx-core/src/mq/config.rs
+++ b/crates/dbx-core/src/mq/config.rs
@@ -170,6 +170,7 @@ mod tests {
username: String::new(),
password: String::new(),
database: None,
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,
diff --git a/crates/dbx-core/src/mq/service.rs b/crates/dbx-core/src/mq/service.rs
index 146ea56b9c..3bfcacedf7 100644
--- a/crates/dbx-core/src/mq/service.rs
+++ b/crates/dbx-core/src/mq/service.rs
@@ -880,6 +880,7 @@ mod tests {
username: String::new(),
password: String::new(),
database: None,
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,
diff --git a/crates/dbx-core/src/nacos/config.rs b/crates/dbx-core/src/nacos/config.rs
index 5d36d956f6..42e415ee73 100644
--- a/crates/dbx-core/src/nacos/config.rs
+++ b/crates/dbx-core/src/nacos/config.rs
@@ -297,6 +297,7 @@ mod tests {
username: String::new(),
password: String::new(),
database: None,
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,
diff --git a/crates/dbx-core/src/nacos/service.rs b/crates/dbx-core/src/nacos/service.rs
index 5846d36579..f24ac2d9c5 100644
--- a/crates/dbx-core/src/nacos/service.rs
+++ b/crates/dbx-core/src/nacos/service.rs
@@ -367,6 +367,7 @@ mod tests {
username: String::new(),
password: String::new(),
database: None,
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,
@@ -440,6 +441,7 @@ mod tests {
username: String::new(),
password: String::new(),
database: None,
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,
diff --git a/crates/dbx-core/src/production_safety.rs b/crates/dbx-core/src/production_safety.rs
index 3157e21d07..35d828db5e 100644
--- a/crates/dbx-core/src/production_safety.rs
+++ b/crates/dbx-core/src/production_safety.rs
@@ -652,6 +652,7 @@ mod tests {
username: "root".to_string(),
password: String::new(),
database: None,
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,
diff --git a/crates/dbx-core/src/query.rs b/crates/dbx-core/src/query.rs
index 7770bf7397..f882500653 100644
--- a/crates/dbx-core/src/query.rs
+++ b/crates/dbx-core/src/query.rs
@@ -4505,6 +4505,7 @@ for line in sys.stdin:
username: String::new(),
password: String::new(),
database: None,
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,
@@ -5837,6 +5838,7 @@ for line in sys.stdin:
username: String::new(),
password: String::new(),
database: None,
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,
diff --git a/crates/dbx-core/src/schema.rs b/crates/dbx-core/src/schema.rs
index 1a8f29ae5c..f0ea58e2bb 100644
--- a/crates/dbx-core/src/schema.rs
+++ b/crates/dbx-core/src/schema.rs
@@ -2704,6 +2704,7 @@ mod tests {
username: "user".to_string(),
password: "secret".to_string(),
database: Some("demo".to_string()),
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,
diff --git a/crates/dbx-core/src/schema/normalization.rs b/crates/dbx-core/src/schema/normalization.rs
index fcf5837ab2..9f56b76f39 100644
--- a/crates/dbx-core/src/schema/normalization.rs
+++ b/crates/dbx-core/src/schema/normalization.rs
@@ -157,6 +157,7 @@ mod tests {
username: "user".to_string(),
password: "secret".to_string(),
database: Some("demo".to_string()),
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,
diff --git a/crates/dbx-core/src/storage.rs b/crates/dbx-core/src/storage.rs
index 451ea9445d..ae7d45679e 100644
--- a/crates/dbx-core/src/storage.rs
+++ b/crates/dbx-core/src/storage.rs
@@ -4195,6 +4195,7 @@ mod tests {
username: String::new(),
password: String::new(),
database: None,
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,
@@ -4260,6 +4261,7 @@ mod tests {
username: "nacos".to_string(),
password: String::new(),
database: None,
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,
diff --git a/crates/dbx-core/src/transfer.rs b/crates/dbx-core/src/transfer.rs
index 785d0a947b..eb1fa1b55e 100644
--- a/crates/dbx-core/src/transfer.rs
+++ b/crates/dbx-core/src/transfer.rs
@@ -9625,6 +9625,7 @@ SELECT 1 FROM dual"#
username: String::new(),
password: String::new(),
database: None,
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,
diff --git a/crates/dbx-core/tests/database_export_prefetch.rs b/crates/dbx-core/tests/database_export_prefetch.rs
index b1bc8085e5..5884ecfbdd 100644
--- a/crates/dbx-core/tests/database_export_prefetch.rs
+++ b/crates/dbx-core/tests/database_export_prefetch.rs
@@ -99,6 +99,7 @@ fn postgres_test_config(id: &str, port: u16) -> ConnectionConfig {
username: "postgres".to_string(),
password: "postgres".to_string(),
database: Some("postgres".to_string()),
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
attached_databases: Vec::new(),
diff --git a/crates/dbx-core/tests/dump_docs_fixture.rs b/crates/dbx-core/tests/dump_docs_fixture.rs
index 3ade979040..b86893045f 100644
--- a/crates/dbx-core/tests/dump_docs_fixture.rs
+++ b/crates/dbx-core/tests/dump_docs_fixture.rs
@@ -36,6 +36,7 @@ fn live_postgres_config(
username: user.to_string(),
password: password.to_string(),
database: Some(database.to_string()),
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
attached_databases: Vec::new(),
diff --git a/crates/dbx-core/tests/live_postgres_docs_annotations.rs b/crates/dbx-core/tests/live_postgres_docs_annotations.rs
index b73dc4e2b1..2e9c2f798c 100644
--- a/crates/dbx-core/tests/live_postgres_docs_annotations.rs
+++ b/crates/dbx-core/tests/live_postgres_docs_annotations.rs
@@ -32,6 +32,7 @@ fn live_postgres_config(
username: user.to_string(),
password: password.to_string(),
database: Some(database.to_string()),
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
attached_databases: Vec::new(),
diff --git a/crates/dbx-core/tests/live_postgres_docs_snapshot.rs b/crates/dbx-core/tests/live_postgres_docs_snapshot.rs
index 8ad75a389c..24f4452a26 100644
--- a/crates/dbx-core/tests/live_postgres_docs_snapshot.rs
+++ b/crates/dbx-core/tests/live_postgres_docs_snapshot.rs
@@ -27,6 +27,7 @@ fn live_postgres_config(
username: user.to_string(),
password: password.to_string(),
database: Some(database.to_string()),
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
attached_databases: Vec::new(),
diff --git a/crates/dbx-core/tests/live_postgres_query_result_export.rs b/crates/dbx-core/tests/live_postgres_query_result_export.rs
index cdda9b2b2e..2155980673 100644
--- a/crates/dbx-core/tests/live_postgres_query_result_export.rs
+++ b/crates/dbx-core/tests/live_postgres_query_result_export.rs
@@ -32,6 +32,7 @@ fn live_postgres_config(
username: user.to_string(),
password: password.to_string(),
database: Some(database.to_string()),
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
attached_databases: Vec::new(),
diff --git a/crates/dbx-core/tests/live_postgres_transfer.rs b/crates/dbx-core/tests/live_postgres_transfer.rs
index 1b2cbab0e9..87411ef250 100644
--- a/crates/dbx-core/tests/live_postgres_transfer.rs
+++ b/crates/dbx-core/tests/live_postgres_transfer.rs
@@ -24,6 +24,7 @@ fn postgres_test_config(id: &str, database: &str) -> ConnectionConfig {
username: "postgres".to_string(),
password: String::new(),
database: Some(database.to_string()),
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
attached_databases: Vec::new(),
diff --git a/crates/dbx-core/tests/live_sqlserver_completion.rs b/crates/dbx-core/tests/live_sqlserver_completion.rs
index 9ba8bf9259..3efa9f0b9a 100644
--- a/crates/dbx-core/tests/live_sqlserver_completion.rs
+++ b/crates/dbx-core/tests/live_sqlserver_completion.rs
@@ -33,6 +33,7 @@ fn live_sqlserver_config(id: &str, database: &str) -> dbx_core::models::connecti
username: std::env::var("DBX_LIVE_SQLSERVER_USER").unwrap_or_else(|_| "sa".to_string()),
password: std::env::var("DBX_LIVE_SQLSERVER_PASSWORD").expect("DBX_LIVE_SQLSERVER_PASSWORD"),
database: Some(database.to_string()),
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
attached_databases: Vec::new(),
diff --git a/crates/dbx-core/tests/live_sqlserver_query_result_export.rs b/crates/dbx-core/tests/live_sqlserver_query_result_export.rs
index f9bd417596..c5ec0deebc 100644
--- a/crates/dbx-core/tests/live_sqlserver_query_result_export.rs
+++ b/crates/dbx-core/tests/live_sqlserver_query_result_export.rs
@@ -22,6 +22,7 @@ fn live_sqlserver_config(id: &str, database: &str) -> dbx_core::models::connecti
username: std::env::var("DBX_LIVE_SQLSERVER_USER").unwrap_or_else(|_| "sa".to_string()),
password: std::env::var("DBX_LIVE_SQLSERVER_PASSWORD").expect("DBX_LIVE_SQLSERVER_PASSWORD"),
database: Some(database.to_string()),
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
attached_databases: Vec::new(),
diff --git a/crates/dbx-web/src/routes/connection.rs b/crates/dbx-web/src/routes/connection.rs
index fcd385a750..1a246749f1 100644
--- a/crates/dbx-web/src/routes/connection.rs
+++ b/crates/dbx-web/src/routes/connection.rs
@@ -519,6 +519,7 @@ mod tests {
username: String::new(),
password: String::new(),
database: None,
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,
diff --git a/crates/dbx-web/src/routes/transfer.rs b/crates/dbx-web/src/routes/transfer.rs
index de04e267e2..52c0ffeb56 100644
--- a/crates/dbx-web/src/routes/transfer.rs
+++ b/crates/dbx-web/src/routes/transfer.rs
@@ -541,6 +541,7 @@ mod tests {
username: String::new(),
password: String::new(),
database: None,
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,
diff --git a/src-tauri/src/commands/connection.rs b/src-tauri/src/commands/connection.rs
index f842ea4279..99d487a1a9 100644
--- a/src-tauri/src/commands/connection.rs
+++ b/src-tauri/src/commands/connection.rs
@@ -192,6 +192,7 @@ mod tests {
username: "mongouser".to_string(),
password: "secret".to_string(),
database: Some("RestCloud_V45PUB_Gateway".to_string()),
+ default_schema: None,
visible_databases: None,
visible_schemas: None,
show_system_schemas: false,