refactor: Apple-pattern storage DI plus 3 product bug fixes

CHANGELOG.md

@@ -72,6 +72,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Native Search Field focus regression when clearing text
 - PostgreSQL Create Database failed with `new collation incompatible with template database` on glibc-initialized servers (#927). Encodings, collations, and the `template1` defaults are now read from the server. `LC_CTYPE` mirrors `LC_COLLATE`, and `TEMPLATE template0` is added automatically when the chosen collation differs from `template1.datcollate`.
 - Redshift Create Database emitted PostgreSQL `LC_COLLATE` syntax which is invalid Redshift grammar. Now emits `COLLATE { CASE_SENSITIVE | CASE_INSENSITIVE }`.
+- Expand tilde in SSH agent socket and `IdentityAgent` paths so 1Password and similar agents work when configured with `~/...` paths.
+- Persist group deletions before firing the sync notification, fixing a race that could re-upload deleted groups via iCloud.
+- Refuse to generate SQL when the database dialect cannot be resolved, instead of silently emitting unquoted identifiers.
 
 ## [0.36.0] - 2026-04-27
 

TablePro.xcodeproj/xcshareddata/xcschemes/TablePro.xcscheme

@@ -33,7 +33,7 @@
       <Testables>
          <TestableReference
             skipped = "NO"
-            parallelizable = "YES">
+            parallelizable = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "5ABCC5A62F43856700EAF3FC"

TablePro/Core/ChangeTracking/DataChangeManager.swift

@@ -421,7 +421,7 @@ final class DataChangeManager: ChangeManaging {
             )
         }
 
-        let generator = SQLStatementGenerator(
+        let generator = try SQLStatementGenerator(
             tableName: tableName,
             columns: columns,
             primaryKeyColumns: primaryKeyColumns,

TablePro/Core/ChangeTracking/SQLStatementGenerator.swift

@@ -35,13 +35,18 @@ struct SQLStatementGenerator {
         parameterStyle: ParameterStyle? = nil,
         dialect: SQLDialectDescriptor? = nil,
         quoteIdentifier: ((String) -> String)? = nil
-    ) {
+    ) throws {
         self.tableName = tableName
         self.columns = columns
         self.primaryKeyColumns = primaryKeyColumns
         self.databaseType = databaseType
         self.parameterStyle = parameterStyle ?? Self.defaultParameterStyle(for: databaseType)
-        self.quoteIdentifierFn = quoteIdentifier ?? quoteIdentifierFromDialect(dialect)
+        if let quoteIdentifier {
+            self.quoteIdentifierFn = quoteIdentifier
+        } else {
+            let resolvedDialect = try resolveSQLDialect(for: databaseType, explicit: dialect)
+            self.quoteIdentifierFn = quoteIdentifierFromDialect(resolvedDialect)
+        }
     }
 
     private static func defaultParameterStyle(for databaseType: DatabaseType) -> ParameterStyle {

TablePro/Core/SSH/LibSSH2TunnelFactory.swift

@@ -508,9 +508,9 @@ internal enum LibSSH2TunnelFactory {
             // Resolve agent socket: UI config > SSH config IdentityAgent > system default
             let socketPath: String?
             if !config.agentSocketPath.isEmpty {
-                socketPath = config.agentSocketPath
+                socketPath = SSHPathUtilities.expandTilde(config.agentSocketPath)
             } else if let agentPath = configEntry?.identityAgent, !agentPath.isEmpty {
-                socketPath = agentPath
+                socketPath = SSHPathUtilities.expandTilde(agentPath)
             } else {
                 socketPath = nil
             }

TablePro/Core/Services/Infrastructure/SessionStateFactory.swift

@@ -7,6 +7,9 @@
 //
 
 import Foundation
+import os
+
+private let sessionStateLogger = Logger(subsystem: "com.TablePro", category: "SessionStateFactory")
 
 @MainActor
 enum SessionStateFactory {
@@ -75,18 +78,22 @@ enum SessionStateFactory {
                 case .table:
                     toolbarSt.isTableTab = true
                     if let tableName = payload.tableName {
-                        if payload.isPreview {
-                            tabMgr.addPreviewTableTab(
-                                tableName: tableName,
-                                databaseType: connection.type,
-                                databaseName: payload.databaseName ?? connection.database
-                            )
-                        } else {
-                            tabMgr.addTableTab(
-                                tableName: tableName,
-                                databaseType: connection.type,
-                                databaseName: payload.databaseName ?? connection.database
-                            )
+                        do {
+                            if payload.isPreview {
+                                try tabMgr.addPreviewTableTab(
+                                    tableName: tableName,
+                                    databaseType: connection.type,
+                                    databaseName: payload.databaseName ?? connection.database
+                                )
+                            } else {
+                                try tabMgr.addTableTab(
+                                    tableName: tableName,
+                                    databaseType: connection.type,
+                                    databaseName: payload.databaseName ?? connection.database
+                                )
+                            }
+                        } catch {
+                            sessionStateLogger.error("create tab for table failed: \(error.localizedDescription, privacy: .public)")
                         }
                         if let index = tabMgr.selectedTabIndex {
                             tabMgr.tabs[index].tableContext.isView = payload.isView

TablePro/Core/Storage/GroupStorage.swift

@@ -85,13 +85,13 @@ final class GroupStorage {
         let descendantIds = collectAllDescendantGroupIds(groupId: group.id, groups: groups)
         let allIdsToDelete = descendantIds.union([group.id])
 
+        groups.removeAll { allIdsToDelete.contains($0.id) }
+        saveGroups(groups)
+
         for deletedId in allIdsToDelete {
             SyncChangeTracker.shared.markDeleted(.group, id: deletedId.uuidString)
         }
 
-        groups.removeAll { allIdsToDelete.contains($0.id) }
-        saveGroups(groups)
-
         let storage = ConnectionStorage.shared
         var connections = storage.loadConnections()
         var changed = false

TablePro/Core/Utilities/SQL/DialectQuoteHelper.swift

@@ -2,16 +2,25 @@
 //  DialectQuoteHelper.swift
 //  TablePro
 //
-//  Builds an identifier-quoting closure from a SQL dialect descriptor.
-//
 
 import Foundation
 import TableProPluginKit
 
-/// Build an identifier-quoting closure from a dialect descriptor.
-/// NoSQL databases (nil dialect) use identity (return name as-is).
-func quoteIdentifierFromDialect(_ dialect: SQLDialectDescriptor?) -> (String) -> String {
-    guard let dialect else { return { $0 } }
+enum SQLDialectError: Error, LocalizedError {
+    case dialectUnavailable(typeId: String)
+
+    var errorDescription: String? {
+        switch self {
+        case .dialectUnavailable(let typeId):
+            return String(
+                format: String(localized: "SQL dialect for %@ is not available. The plugin may not be installed or loaded."),
+                typeId
+            )
+        }
+    }
+}
+
+func quoteIdentifierFromDialect(_ dialect: SQLDialectDescriptor) -> (String) -> String {
     let q = dialect.identifierQuote
     if q == "[" {
         return { name in
@@ -24,3 +33,15 @@ func quoteIdentifierFromDialect(_ dialect: SQLDialectDescriptor?) -> (String) ->
         return "\(q)\(escaped)\(q)"
     }
 }
+
+func resolveSQLDialect(
+    for databaseType: DatabaseType,
+    explicit: SQLDialectDescriptor? = nil
+) throws -> SQLDialectDescriptor {
+    if let explicit { return explicit }
+    if let dialect = PluginMetadataRegistry.shared
+        .snapshot(forTypeId: databaseType.pluginTypeId)?.editor.sqlDialect {
+        return dialect
+    }
+    throw SQLDialectError.dialectUnavailable(typeId: databaseType.pluginTypeId)
+}

TablePro/Core/Utilities/SQL/SQLRowToStatementConverter.swift

@@ -21,21 +21,27 @@ internal struct SQLRowToStatementConverter {
         dialect: SQLDialectDescriptor? = nil,
         quoteIdentifier: ((String) -> String)? = nil,
         escapeStringLiteral: ((String) -> String)? = nil
-    ) {
+    ) throws {
         self.tableName = tableName
         self.columns = columns
         self.primaryKeyColumn = primaryKeyColumn
         self.databaseType = databaseType
-        self.quoteIdentifierFn = quoteIdentifier ?? quoteIdentifierFromDialect(dialect)
-        self.escapeStringFn = escapeStringLiteral ?? Self.defaultEscapeFunction(dialect: dialect)
+
+        if let quoteIdentifier, let escapeStringLiteral {
+            self.quoteIdentifierFn = quoteIdentifier
+            self.escapeStringFn = escapeStringLiteral
+            return
+        }
+
+        let resolvedDialect = try resolveSQLDialect(for: databaseType, explicit: dialect)
+        self.quoteIdentifierFn = quoteIdentifier ?? quoteIdentifierFromDialect(resolvedDialect)
+        self.escapeStringFn = escapeStringLiteral ?? Self.defaultEscapeFunction(dialect: resolvedDialect)
     }
 
     private static let maxRows = 50_000
 
-    /// Fallback escape function when no plugin driver is available.
-    /// Dialects with `requiresBackslashEscaping` get backslash escaping; others use ANSI SQL.
-    private static func defaultEscapeFunction(dialect: SQLDialectDescriptor?) -> (String) -> String {
-        if dialect?.requiresBackslashEscaping == true {
+    private static func defaultEscapeFunction(dialect: SQLDialectDescriptor) -> (String) -> String {
+        if dialect.requiresBackslashEscaping {
             return { value in
                 var result = value
                 result = result.replacingOccurrences(of: "\\", with: "\\\\")

TablePro/Models/Query/QueryTab.swift

@@ -94,8 +94,7 @@ struct QueryTab: Identifiable, Equatable {
         databaseType: DatabaseType,
         schemaName: String? = nil,
         quoteIdentifier: ((String) -> String)? = nil
-    ) -> String {
-        let quote = quoteIdentifier ?? quoteIdentifierFromDialect(PluginManager.shared.sqlDialect(for: databaseType))
+    ) throws -> String {
         let pageSize = AppSettingsManager.shared.dataGrid.defaultPageSize
 
         if let pluginDriver = PluginManager.shared.queryBuildingDriver(for: databaseType),
@@ -112,6 +111,8 @@ struct QueryTab: Identifiable, Equatable {
         case .bash:
             return "SCAN 0 MATCH * COUNT \(pageSize)"
         default:
+            let dialect = try resolveSQLDialect(for: databaseType)
+            let quote = quoteIdentifier ?? quoteIdentifierFromDialect(dialect)
             let qualifiedName: String
             if let schema = schemaName, !schema.isEmpty {
                 qualifiedName = "\(quote(schema)).\(quote(tableName))"

TablePro/Models/Query/QueryTabManager.swift

@@ -103,7 +103,7 @@ final class QueryTabManager {
         databaseType: DatabaseType = .mysql,
         databaseName: String = "",
         quoteIdentifier: ((String) -> String)? = nil
-    ) {
+    ) throws {
         if let existingTab = tabs.first(where: {
             $0.tabType == .table && $0.tableContext.tableName == tableName && $0.tableContext.databaseName == databaseName
         }) {
@@ -112,7 +112,7 @@ final class QueryTabManager {
         }
 
         let pageSize = AppSettingsManager.shared.dataGrid.defaultPageSize
-        let query = QueryTab.buildBaseTableQuery(
+        let query = try QueryTab.buildBaseTableQuery(
             tableName: tableName, databaseType: databaseType, quoteIdentifier: quoteIdentifier
         )
         var newTab = QueryTab(
@@ -180,9 +180,9 @@ final class QueryTabManager {
         databaseType: DatabaseType = .mysql,
         databaseName: String = "",
         quoteIdentifier: ((String) -> String)? = nil
-    ) {
+    ) throws {
         let pageSize = AppSettingsManager.shared.dataGrid.defaultPageSize
-        let query = QueryTab.buildBaseTableQuery(
+        let query = try QueryTab.buildBaseTableQuery(
             tableName: tableName, databaseType: databaseType, quoteIdentifier: quoteIdentifier
         )
         var newTab = QueryTab(
@@ -207,14 +207,14 @@ final class QueryTabManager {
         isView: Bool = false, databaseName: String = "",
         schemaName: String? = nil, isPreview: Bool = false,
         quoteIdentifier: ((String) -> String)? = nil
-    ) -> Bool {
+    ) throws -> Bool {
         guard let selectedId = selectedTabId,
               let selectedIndex = tabs.firstIndex(where: { $0.id == selectedId })
         else {
             return false
         }
 
-        let query = QueryTab.buildBaseTableQuery(
+        let query = try QueryTab.buildBaseTableQuery(
             tableName: tableName,
             databaseType: databaseType,
             schemaName: schemaName,

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

@@ -73,13 +73,19 @@ extension MainContentCoordinator {
             return
         }
 
-        let needsQuery = tabManager.replaceTabContent(
-            tableName: referencedTable,
-            databaseType: connection.type,
-            isView: false,
-            databaseName: currentDatabase,
-            schemaName: targetSchema
-        )
+        let needsQuery: Bool
+        do {
+            needsQuery = try tabManager.replaceTabContent(
+                tableName: referencedTable,
+                databaseType: connection.type,
+                isView: false,
+                databaseName: currentDatabase,
+                schemaName: targetSchema
+            )
+        } catch {
+            fkNavigationLogger.error("navigateToFKReference replaceTabContent failed: \(error.localizedDescription, privacy: .public)")
+            return
+        }
 
         if needsQuery, let (tab, tabIndex) = tabManager.selectedTabAndIndex {
             setActiveTableRows(TableRows(), for: tab.id)