Skip to content

Commit d1190bc

Browse files
committed
fix: only reset currentSchema on database switch for schema-grouped databases
1 parent dcca78c commit d1190bc

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

TablePro/Views/Main/Extensions/MainContentCoordinator+Navigation.swift

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,11 +334,14 @@ extension MainContentCoordinator {
334334
if let adapter = driver as? PluginDriverAdapter {
335335
try await adapter.switchDatabase(to: database)
336336
}
337-
let defaultSchema = pm.defaultSchemaName(for: connection.type)
337+
let grouping = pm.databaseGroupingStrategy(for: connection.type)
338338
DatabaseManager.shared.updateSession(connectionId) { session in
339339
session.currentDatabase = database
340-
// Reset schema to plugin default (e.g. "dbo" for MSSQL)
341-
session.currentSchema = defaultSchema
340+
// Schema-grouped databases (e.g. MSSQL) need currentSchema
341+
// reset to the plugin default (e.g. "dbo") on database switch.
342+
if grouping == .bySchema {
343+
session.currentSchema = pm.defaultSchemaName(for: connection.type)
344+
}
342345
}
343346
}
344347
AppSettingsStorage.shared.saveLastDatabase(database, for: connectionId)

0 commit comments

Comments
 (0)