Merge branch 'main' into feat/quick-switcher-fuzzy-engine

datlechin · web-flow · commit d4bb25c3a701 · 2026-06-11T13:58:13.000+07:00
Signed-off-by: Ngô Quốc Đạt &lt;datlechin@gmail.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Quick Switcher scopes: Cmd+1 to Cmd+4 narrow results to All, Tables, Databases, or Queries.
 - Option+Return in the Quick Switcher opens the table in a new tab; right-click a result to open its structure, copy the name, or copy the query.
 - Tables already open in a tab show an Open badge in the Quick Switcher, rank higher, and Return switches to the existing tab.
+- `.psql` and `.pgsql` files now open in the SQL editor like `.sql`: Finder double-click, the open and save panels, and linked SQL folders all accept them. (#1641)
 
 ### Changed
 
@@ -28,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Exports no longer fail mid-table on servers that enforce a statement time limit; the export session disables the limit and restores it afterwards, the same way mysqldump does. (#1633)
 - Quick Switcher no longer shows an empty table list when opened before the schema has finished loading.
 - Opening a query from history in the Quick Switcher loads the full query instead of a 100-character preview.
+- Refreshing a table now reloads its data even when the previous load is still running; before, the refresh was silently dropped and the grid kept stale rows. (#1637)
 
 ### Security
 
diff --git a/TablePro/Core/Services/Infrastructure/SQLFileService.swift b/TablePro/Core/Services/Infrastructure/SQLFileService.swift
@@ -13,6 +13,13 @@ import UniformTypeIdentifiers
 enum SQLFileService {
     private static let logger = Logger(subsystem: "com.TablePro", category: "SQLFileService")
 
+    static let supportedExtensions: Set<String> = ["sql", "psql", "pgsql"]
+
+    private static var allowedContentTypes: [UTType] {
+        let types = Set(supportedExtensions.compactMap { UTType(filenameExtension: $0) })
+        return types.isEmpty ? [.plainText] : Array(types)
+    }
+
     /// Reads a SQL file from disk.
     static func readFile(url: URL) async throws -> String {
         try await Task.detached {
@@ -34,7 +41,7 @@ enum SQLFileService {
     @MainActor
     static func showOpenPanel() async -> [URL]? {
         let panel = NSOpenPanel()
-        panel.allowedContentTypes = [UTType(filenameExtension: "sql") ?? .plainText]
+        panel.allowedContentTypes = allowedContentTypes
         panel.allowsMultipleSelection = true
         panel.message = String(localized: "Select SQL files to open")
         let response = await panel.begin()
@@ -46,7 +53,7 @@ enum SQLFileService {
     @MainActor
     static func showSavePanel(suggestedName: String = "query.sql") async -> URL? {
         let panel = NSSavePanel()
-        panel.allowedContentTypes = [UTType(filenameExtension: "sql") ?? .plainText]
+        panel.allowedContentTypes = allowedContentTypes
         panel.canCreateDirectories = true
         panel.nameFieldStringValue = suggestedName
         panel.message = String(localized: "Save SQL file")
diff --git a/TablePro/Core/Services/Infrastructure/URLClassifier.swift b/TablePro/Core/Services/Infrastructure/URLClassifier.swift
@@ -28,7 +28,7 @@ internal enum URLClassifier {
         if ext == "tablepro" {
             return .success(.openConnectionShare(url))
         }
-        if ext == "sql" {
+        if SQLFileService.supportedExtensions.contains(ext) {
             return .success(.openSQLFile(url))
         }
         if PluginManager.shared.allInspectorFileExtensions.contains(ext) {
diff --git a/TablePro/Core/Services/SQL/SQLFolderWatcher.swift b/TablePro/Core/Services/SQL/SQLFolderWatcher.swift
@@ -152,7 +152,7 @@ internal final class SQLFolderWatcher {
         var indexed: [LinkedSQLIndex.IndexedFile] = []
 
         for case let url as URL in enumerator {
-            guard url.pathExtension.lowercased() == "sql" else { continue }
+            guard SQLFileService.supportedExtensions.contains(url.pathExtension.lowercased()) else { continue }
 
             let resourceValues = try? url.resourceValues(forKeys: [
                 .isRegularFileKey, .contentModificationDateKey, .fileSizeKey
diff --git a/TablePro/Info.plist b/TablePro/Info.plist
@@ -14,6 +14,8 @@
 			<key>CFBundleTypeExtensions</key>
 			<array>
 				<string>sql</string>
+				<string>psql</string>
+				<string>pgsql</string>
 			</array>
 			<key>CFBundleTypeIconSystemGenerated</key>
 			<true/>
@@ -154,6 +156,8 @@
 				<key>public.filename-extension</key>
 				<array>
 					<string>sql</string>
+					<string>psql</string>
+					<string>pgsql</string>
 				</array>
 			</dict>
 		</dict>
diff --git a/TablePro/Views/Main/Child/DataTabGridDelegate.swift b/TablePro/Views/Main/Child/DataTabGridDelegate.swift
@@ -20,7 +20,6 @@ final class DataTabGridDelegate: DataGridViewDelegate {
     var onAddRow: (() -> Void)?
     var onUndoInsert: ((Int) -> Void)?
     var onFilterColumn: ((String) -> Void)?
-    var onRefresh: (() -> Void)?
 
     // MARK: - DataGridViewDelegate
 
@@ -44,10 +43,6 @@ final class DataTabGridDelegate: DataGridViewDelegate {
         onFilterColumn?(columnName)
     }
 
-    func dataGridRefresh() {
-        onRefresh?()
-    }
-
     func dataGridDeleteRows(_ indices: Set<Int>) {
         coordinator?.deleteSelectedRows(indices: indices)
     }
diff --git a/TablePro/Views/Main/Child/MainEditorContentView.swift b/TablePro/Views/Main/Child/MainEditorContentView.swift
@@ -44,7 +44,6 @@ struct MainEditorContentView: View {
     let onFilterColumn: (String) -> Void
     let onApplyFilters: ([TableFilter]) -> Void
     let onClearFilters: () -> Void
-    let onRefresh: () -> Void
 
     // Pagination callbacks
     let onFirstPage: () -> Void
@@ -182,7 +181,6 @@ struct MainEditorContentView: View {
         dataTabDelegate.onSortStateChanged = onSortStateChanged
         dataTabDelegate.onUndoInsert = onUndoInsert
         dataTabDelegate.onFilterColumn = onFilterColumn
-        dataTabDelegate.onRefresh = onRefresh
     }
 
     private func refreshDataTabDelegateMutableRefs() {
diff --git a/TablePro/Views/Main/Extensions/MainContentCoordinator+Refresh.swift b/TablePro/Views/Main/Extensions/MainContentCoordinator+Refresh.swift
@@ -33,7 +33,7 @@ extension MainContentCoordinator {
                     // Query tabs should not auto-execute on refresh (use Cmd+Enter to execute)
                     if let (tab, tabIndex) = tabManager.selectedTabAndIndex,
                        tab.tabType == .table {
-                        currentQueryTask?.cancel()
+                        cancelCurrentQuery()
                         rebuildTableQuery(at: tabIndex)
                         runQuery()
                     }
@@ -42,7 +42,7 @@ extension MainContentCoordinator {
         } else {
             if let (tab, tabIndex) = tabManager.selectedTabAndIndex,
                tab.tabType == .table {
-                currentQueryTask?.cancel()
+                cancelCurrentQuery()
                 rebuildTableQuery(at: tabIndex)
                 runQuery()
             }
diff --git a/TablePro/Views/Main/MainContentCoordinator.swift b/TablePro/Views/Main/MainContentCoordinator.swift
@@ -527,13 +527,24 @@ final class MainContentCoordinator {
     }
 
     func refreshTables() async {
-        guard let driver = services.databaseManager.driver(for: connectionId) else { return }
         schemaColumns.removeAll()
-        await services.schemaService.reload(
-            connectionId: connectionId,
-            driver: driver,
-            connection: connection
-        )
+        let schemaService = services.schemaService
+        let connectionId = connectionId
+        let connection = connection
+        do {
+            try await services.databaseManager.withMetadataDriver(
+                connectionId: connectionId,
+                workload: .bulk
+            ) { driver in
+                await schemaService.reload(
+                    connectionId: connectionId,
+                    driver: driver,
+                    connection: connection
+                )
+            }
+        } catch {
+            Self.logger.warning("Schema refresh failed: \(error.localizedDescription, privacy: .public)")
+        }
         await reconcilePostSchemaLoad()
     }
 
diff --git a/TablePro/Views/Main/MainContentView.swift b/TablePro/Views/Main/MainContentView.swift
@@ -462,9 +462,6 @@ struct MainContentView: View {
             onClearFilters: {
                 coordinator.clearFiltersAndReload()
             },
-            onRefresh: {
-                coordinator.runQuery()
-            },
             onFirstPage: {
                 coordinator.goToFirstPage()
             },
diff --git a/TablePro/Views/Results/DataGridViewDelegate.swift b/TablePro/Views/Results/DataGridViewDelegate.swift
@@ -27,7 +27,6 @@ protocol DataGridViewDelegate: AnyObject {
     func dataGridCanClearResults() -> Bool
     func dataGridHideColumn(_ columnName: String)
     func dataGridShowAllColumns()
-    func dataGridRefresh()
     func dataGridVisualState(forRow row: Int) -> RowVisualState?
     func dataGridRowView(for tableView: NSTableView, row: Int, coordinator: TableViewCoordinator) -> NSTableRowView?
     func dataGridEmptySpaceMenu() -> NSMenu?
@@ -56,7 +55,6 @@ extension DataGridViewDelegate {
     func dataGridCanClearResults() -> Bool { false }
     func dataGridHideColumn(_ columnName: String) {}
     func dataGridShowAllColumns() {}
-    func dataGridRefresh() {}
     func dataGridVisualState(forRow row: Int) -> RowVisualState? { nil }
     func dataGridRowView(for tableView: NSTableView, row: Int, coordinator: TableViewCoordinator) -> NSTableRowView? { nil }
     func dataGridEmptySpaceMenu() -> NSMenu? { nil }
diff --git a/TableProTests/Core/Services/Infrastructure/URLClassifierTests.swift b/TableProTests/Core/Services/Infrastructure/URLClassifierTests.swift
@@ -50,9 +50,9 @@ struct URLClassifierTests {
         #expect(intent == nil)
     }
 
-    @Test("SQL file routes to openSQLFile")
-    func routesSQLFile() {
-        let sqlURL = URL(fileURLWithPath: "/tmp/query.sql")
+    @Test("SQL file routes to openSQLFile", arguments: ["sql", "psql", "pgsql", "PSQL"])
+    func routesSQLFile(ext: String) {
+        let sqlURL = URL(fileURLWithPath: "/tmp/query.\(ext)")
         let intent = URLClassifier.classify(sqlURL)
         guard case .some(.success(.openSQLFile(let routed))) = intent else {
             Issue.record("Expected .openSQLFile, got \(String(describing: intent))")
diff --git a/TableProTests/Views/Main/MainContentCoordinatorRefreshTests.swift b/TableProTests/Views/Main/MainContentCoordinatorRefreshTests.swift
@@ -0,0 +1,166 @@
+//
+//  MainContentCoordinatorRefreshTests.swift
+//  TableProTests
+//
+//  Tests for handleRefresh, the entry point behind the Refresh toolbar
+//  button and Cmd+R. Regression coverage for #1637: a refresh issued while
+//  a query was in flight was silently dropped because the in-flight
+//  cancellation cleared isExecuting asynchronously.
+//
+
+import Foundation
+import Testing
+
+@testable import TablePro
+
+@Suite("MainContentCoordinator handleRefresh")
+@MainActor
+struct MainContentCoordinatorRefreshTests {
+    private func makeCoordinator() -> (MainContentCoordinator, QueryTabManager) {
+        let tabManager = QueryTabManager()
+        let coordinator = MainContentCoordinator(
+            connection: TestFixtures.makeConnection(),
+            tabManager: tabManager,
+            changeManager: DataChangeManager(),
+            toolbarState: ConnectionToolbarState()
+        )
+        return (coordinator, tabManager)
+    }
+
+    private func addTableTab(
+        to tabManager: QueryTabManager,
+        tableName: String = "users",
+        query: String = "SELECT * FROM users"
+    ) -> UUID {
+        var tab = QueryTab(
+            title: tableName,
+            query: query,
+            tabType: .table,
+            tableName: tableName
+        )
+        tab.tableContext.isEditable = true
+        tabManager.tabs.append(tab)
+        tabManager.selectedTabId = tab.id
+        return tab.id
+    }
+
+    private func addQueryTab(
+        to tabManager: QueryTabManager,
+        title: String = "Query 1",
+        query: String = "SELECT 1"
+    ) -> UUID {
+        let tab = QueryTab(title: title, query: query, tabType: .query)
+        tabManager.tabs.append(tab)
+        tabManager.selectedTabId = tab.id
+        return tab.id
+    }
+
+    private func simulateInFlightQuery(
+        _ coordinator: MainContentCoordinator,
+        _ tabManager: QueryTabManager,
+        at index: Int
+    ) -> Task<Void, Never> {
+        let inFlight = Task<Void, Never> { _ = try? await Task.sleep(for: .seconds(60)) }
+        coordinator.currentQueryTask = inFlight
+        tabManager.tabs[index].execution.isExecuting = true
+        tabManager.tabs[index].execution.lastExecutedAt = Date()
+        return inFlight
+    }
+
+    @Test("Refresh while a query is in flight cancels it and starts a new execution")
+    func refreshWithInFlightQueryStartsNewExecution() {
+        let (coordinator, tabManager) = makeCoordinator()
+        let tabId = addTableTab(to: tabManager)
+        guard let idx = tabManager.tabs.firstIndex(where: { $0.id == tabId }) else {
+            Issue.record("expected tab to exist")
+            return
+        }
+        let staleTask = simulateInFlightQuery(coordinator, tabManager, at: idx)
+        let initialGeneration = coordinator.queryGeneration
+
+        coordinator.handleRefresh(hasPendingTableOps: false, onDiscard: {})
+        defer { coordinator.currentQueryTask?.cancel() }
+
+        #expect(staleTask.isCancelled == true)
+        #expect(coordinator.queryGeneration == initialGeneration + 2)
+        #expect(coordinator.currentQueryTask != nil)
+        #expect(tabManager.tabs[idx].execution.isExecuting == true)
+    }
+
+    @Test("Refresh on an idle table tab starts an execution")
+    func refreshOnIdleTabStartsExecution() {
+        let (coordinator, tabManager) = makeCoordinator()
+        let tabId = addTableTab(to: tabManager)
+        guard let idx = tabManager.tabs.firstIndex(where: { $0.id == tabId }) else {
+            Issue.record("expected tab to exist")
+            return
+        }
+        tabManager.tabs[idx].execution.lastExecutedAt = Date()
+        let initialGeneration = coordinator.queryGeneration
+
+        coordinator.handleRefresh(hasPendingTableOps: false, onDiscard: {})
+        defer { coordinator.currentQueryTask?.cancel() }
+
+        #expect(coordinator.queryGeneration == initialGeneration + 2)
+        #expect(coordinator.currentQueryTask != nil)
+        #expect(tabManager.tabs[idx].execution.isExecuting == true)
+    }
+
+    @Test("Refresh rebuilds the table query from current state before executing")
+    func refreshRebuildsQuery() {
+        let (coordinator, tabManager) = makeCoordinator()
+        let tabId = addTableTab(to: tabManager, query: "SELECT outdated FROM users")
+        guard let idx = tabManager.tabs.firstIndex(where: { $0.id == tabId }) else {
+            Issue.record("expected tab to exist")
+            return
+        }
+        tabManager.tabs[idx].execution.lastExecutedAt = Date()
+
+        coordinator.handleRefresh(hasPendingTableOps: false, onDiscard: {})
+        defer { coordinator.currentQueryTask?.cancel() }
+
+        #expect(tabManager.tabs[idx].content.query != "SELECT outdated FROM users")
+        #expect(tabManager.tabs[idx].content.query.contains("users"))
+    }
+
+    @Test("Refresh on a query tab does not execute or cancel anything")
+    func refreshOnQueryTabIsNoOp() {
+        let (coordinator, tabManager) = makeCoordinator()
+        let tabId = addQueryTab(to: tabManager)
+        guard let idx = tabManager.tabs.firstIndex(where: { $0.id == tabId }) else {
+            Issue.record("expected tab to exist")
+            return
+        }
+        let inFlight = Task<Void, Never> { _ = try? await Task.sleep(for: .seconds(60)) }
+        defer { inFlight.cancel() }
+        coordinator.currentQueryTask = inFlight
+        tabManager.tabs[idx].execution.isExecuting = true
+        let initialGeneration = coordinator.queryGeneration
+
+        coordinator.handleRefresh(hasPendingTableOps: false, onDiscard: {})
+
+        #expect(inFlight.isCancelled == false)
+        #expect(coordinator.queryGeneration == initialGeneration)
+        #expect(tabManager.tabs[idx].execution.isExecuting == true)
+    }
+
+    @Test("Refresh in structure view leaves execution state untouched")
+    func refreshInStructureViewIsNoOp() {
+        let (coordinator, tabManager) = makeCoordinator()
+        let tabId = addTableTab(to: tabManager)
+        guard let idx = tabManager.tabs.firstIndex(where: { $0.id == tabId }) else {
+            Issue.record("expected tab to exist")
+            return
+        }
+        tabManager.tabs[idx].display.resultsViewMode = .structure
+        let staleTask = simulateInFlightQuery(coordinator, tabManager, at: idx)
+        defer { staleTask.cancel() }
+        let initialGeneration = coordinator.queryGeneration
+
+        coordinator.handleRefresh(hasPendingTableOps: false, onDiscard: {})
+
+        #expect(staleTask.isCancelled == false)
+        #expect(coordinator.queryGeneration == initialGeneration)
+        #expect(tabManager.tabs[idx].execution.isExecuting == true)
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ internal enum URLClassifier {`
`28`	`28`	`if ext == "tablepro" {`
`29`	`29`	`return .success(.openConnectionShare(url))`
`30`	`30`	`}`
`31`		`- if ext == "sql" {`
	`31`	`+ if SQLFileService.supportedExtensions.contains(ext) {`
`32`	`32`	`return .success(.openSQLFile(url))`
`33`	`33`	`}`
`34`	`34`	`if PluginManager.shared.allInspectorFileExtensions.contains(ext) {`