fix: persist and restore PostgreSQL schema on reconnect, fix stuck error dialog (#540)

Author: datlechin

CHANGELOG.md

@@ -26,6 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- PostgreSQL: Schema name lost after app restart, causing "relation does not exist" errors for non-public schemas
+- Error dialog OK button not dismissing when a SwiftUI sheet is active, making the app unusable
 - SQL Server: Unicode characters (Thai, CJK, etc.) in nvarchar/nchar/ntext columns displaying as question marks
 - Globe+F (fn+F) fullscreen shortcut not working in SwiftUI lifecycle app
 

TablePro/Core/Database/DatabaseManager.swift

@@ -192,6 +192,19 @@ final class DatabaseManager {
             // Initialize schema for drivers that support schema switching
             if let schemaDriver = driver as? SchemaSwitchable {
                 activeSessions[connection.id]?.currentSchema = schemaDriver.currentSchema
+
+                // Restore user's last schema if different from default
+                if let savedSchema = AppSettingsStorage.shared.loadLastSchema(for: connection.id),
+                   savedSchema != schemaDriver.currentSchema {
+                    do {
+                        try await schemaDriver.switchSchema(to: savedSchema)
+                        activeSessions[connection.id]?.currentSchema = savedSchema
+                    } catch {
+                        Self.logger.warning(
+                            "Failed to restore saved schema '\(savedSchema, privacy: .public)' for \(connection.id): \(error.localizedDescription, privacy: .public)"
+                        )
+                    }
+                }
             }
 
             // Run post-connect actions declared by the plugin

TablePro/Core/Services/Infrastructure/SessionStateFactory.swift

@@ -71,6 +71,7 @@ enum SessionStateFactory {
                     if let index = tabMgr.selectedTabIndex {
                         tabMgr.tabs[index].isView = payload.isView
                         tabMgr.tabs[index].isEditable = !payload.isView
+                        tabMgr.tabs[index].schemaName = payload.schemaName
                         if payload.showStructure {
                             tabMgr.tabs[index].showStructure = true
                         }

TablePro/Core/Services/Infrastructure/TabPersistenceCoordinator.swift

@@ -148,6 +148,7 @@ internal final class TabPersistenceCoordinator {
             tableName: tab.tableName,
             isView: tab.isView,
             databaseName: tab.databaseName,
+            schemaName: tab.schemaName,
             sourceFileURL: tab.sourceFileURL
         )
     }

TablePro/Core/Storage/AppSettingsStorage.swift

@@ -160,6 +160,20 @@ final class AppSettingsStorage {
         defaults.string(forKey: "com.TablePro.lastSelectedDatabase.\(connectionId)")
     }
 
+    // MARK: - Last Selected Schema (per connection)
+
+    func saveLastSchema(_ schema: String?, for connectionId: UUID) {
+        if let schema {
+            defaults.set(schema, forKey: "com.TablePro.lastSelectedSchema.\(connectionId)")
+        } else {
+            defaults.removeObject(forKey: "com.TablePro.lastSelectedSchema.\(connectionId)")
+        }
+    }
+
+    func loadLastSchema(for connectionId: UUID) -> String? {
+        defaults.string(forKey: "com.TablePro.lastSelectedSchema.\(connectionId)")
+    }
+
     // MARK: - Onboarding
 
     /// Check if user has completed onboarding

TablePro/Models/Query/EditorTabPayload.swift

@@ -21,6 +21,8 @@ internal struct EditorTabPayload: Codable, Hashable {
     internal let tableName: String?
     /// Database context (for multi-database connections)
     internal let databaseName: String?
+    /// Schema context (for multi-schema connections, e.g. PostgreSQL)
+    internal let schemaName: String?
     /// Initial SQL query (for .query tabs opened from files)
     internal let initialQuery: String?
     /// Whether this tab displays a database view (read-only)
@@ -44,6 +46,7 @@ internal struct EditorTabPayload: Codable, Hashable {
         tabType: TabType = .query,
         tableName: String? = nil,
         databaseName: String? = nil,
+        schemaName: String? = nil,
         initialQuery: String? = nil,
         isView: Bool = false,
         showStructure: Bool = false,
@@ -58,6 +61,7 @@ internal struct EditorTabPayload: Codable, Hashable {
         self.tabType = tabType
         self.tableName = tableName
         self.databaseName = databaseName
+        self.schemaName = schemaName
         self.initialQuery = initialQuery
         self.isView = isView
         self.showStructure = showStructure
@@ -75,6 +79,7 @@ internal struct EditorTabPayload: Codable, Hashable {
         tabType = try container.decode(TabType.self, forKey: .tabType)
         tableName = try container.decodeIfPresent(String.self, forKey: .tableName)
         databaseName = try container.decodeIfPresent(String.self, forKey: .databaseName)
+        schemaName = try container.decodeIfPresent(String.self, forKey: .schemaName)
         initialQuery = try container.decodeIfPresent(String.self, forKey: .initialQuery)
         isView = try container.decodeIfPresent(Bool.self, forKey: .isView) ?? false
         showStructure = try container.decodeIfPresent(Bool.self, forKey: .showStructure) ?? false
@@ -99,6 +104,7 @@ internal struct EditorTabPayload: Codable, Hashable {
         self.tabType = tab.tabType
         self.tableName = tab.tableName
         self.databaseName = tab.databaseName
+        self.schemaName = tab.schemaName
         self.initialQuery = tab.query
         self.isView = tab.isView
         self.showStructure = tab.showStructure

TablePro/Models/Query/QueryTab.swift

@@ -26,6 +26,7 @@ struct PersistedTab: Codable {
     let tableName: String?
     var isView: Bool = false
     var databaseName: String = ""
+    var schemaName: String?
     var sourceFileURL: URL?
 }
 
@@ -340,6 +341,7 @@ struct QueryTab: Identifiable, Equatable {
     var isEditable: Bool
     var isView: Bool  // True for database views (read-only)
     var databaseName: String  // Database this tab was opened in (for multi-database restore)
+    var schemaName: String?  // Schema this tab was opened in (for multi-schema restore, e.g. PostgreSQL)
     var showStructure: Bool  // Toggle to show structure view instead of data
     var explainText: String?
     var explainExecutionTime: TimeInterval?
@@ -426,6 +428,7 @@ struct QueryTab: Identifiable, Equatable {
         self.isEditable = tabType == .table
         self.isView = false
         self.databaseName = ""
+        self.schemaName = nil
         self.showStructure = false
         self.pendingChanges = TabPendingChanges()
         self.selectedRowIndices = []
@@ -460,6 +463,7 @@ struct QueryTab: Identifiable, Equatable {
         self.isEditable = persisted.tabType == .table && !persisted.isView
         self.isView = persisted.isView
         self.databaseName = persisted.databaseName
+        self.schemaName = persisted.schemaName
         self.showStructure = false
         self.pendingChanges = TabPendingChanges()
         self.selectedRowIndices = []
@@ -479,6 +483,7 @@ struct QueryTab: Identifiable, Equatable {
     @MainActor static func buildBaseTableQuery(
         tableName: String,
         databaseType: DatabaseType,
+        schemaName: String? = nil,
         quoteIdentifier: ((String) -> String)? = nil
     ) -> String {
         let quote = quoteIdentifier ?? quoteIdentifierFromDialect(PluginManager.shared.sqlDialect(for: databaseType))
@@ -499,13 +504,18 @@ struct QueryTab: Identifiable, Equatable {
         case .bash:
             return "SCAN 0 MATCH * COUNT \(pageSize)"
         default:
-            let quotedName = quote(tableName)
+            let qualifiedName: String
+            if let schema = schemaName, !schema.isEmpty {
+                qualifiedName = "\(quote(schema)).\(quote(tableName))"
+            } else {
+                qualifiedName = quote(tableName)
+            }
             switch PluginManager.shared.paginationStyle(for: databaseType) {
             case .offsetFetch:
                 let orderBy = PluginManager.shared.offsetFetchOrderBy(for: databaseType)
-                return "SELECT * FROM \(quotedName) \(orderBy) OFFSET 0 ROWS FETCH NEXT \(pageSize) ROWS ONLY;"
+                return "SELECT * FROM \(qualifiedName) \(orderBy) OFFSET 0 ROWS FETCH NEXT \(pageSize) ROWS ONLY;"
             case .limit:
-                return "SELECT * FROM \(quotedName) LIMIT \(pageSize);"
+                return "SELECT * FROM \(qualifiedName) LIMIT \(pageSize);"
             }
         }
     }
@@ -532,6 +542,7 @@ struct QueryTab: Identifiable, Equatable {
             tableName: tableName,
             isView: isView,
             databaseName: databaseName,
+            schemaName: schemaName,
             sourceFileURL: sourceFileURL
         )
     }
@@ -695,7 +706,7 @@ final class QueryTabManager {
     func replaceTabContent(
         tableName: String, databaseType: DatabaseType = .mysql,
         isView: Bool = false, databaseName: String = "",
-        isPreview: Bool = false,
+        schemaName: String? = nil, isPreview: Bool = false,
         quoteIdentifier: ((String) -> String)? = nil
     ) -> Bool {
         guard let selectedId = selectedTabId,
@@ -707,6 +718,7 @@ final class QueryTabManager {
         let query = QueryTab.buildBaseTableQuery(
             tableName: tableName,
             databaseType: databaseType,
+            schemaName: schemaName,
             quoteIdentifier: quoteIdentifier
         )
         let pageSize = AppSettingsManager.shared.dataGrid.defaultPageSize
@@ -733,6 +745,7 @@ final class QueryTabManager {
         tab.columnLayout = ColumnLayoutState()
         tab.pagination = PaginationState(pageSize: pageSize)
         tab.databaseName = databaseName
+        tab.schemaName = schemaName
         tab.isPreview = isPreview
         tabs[selectedIndex] = tab
         return true