refactor: rewrite query results system with clean architecture

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Real-time SQL preview with syntax highlighting for CREATE TABLE DDL
 - Multi-database CREATE TABLE support: MySQL, PostgreSQL, SQLite, SQL Server, ClickHouse, DuckDB
 - Auto-fit column width: double-click column divider, right-click header → "Size to Fit" / "Size All Columns to Fit"
+- Close Result Tab shortcut (`Cmd+Shift+W`) to close the active result tab when multiple are open
 
 ### Fixed
 

TablePro/Models/Connection/ConnectionToolbarState.swift

@@ -174,6 +174,9 @@ final class ConnectionToolbarState {
     /// Whether the current tab is a table tab (enables filter/sort actions)
     var isTableTab: Bool = false
 
+    /// Whether the results panel is collapsed
+    var isResultsCollapsed: Bool = false
+
     /// Whether there are pending changes (data grid or file)
     var hasPendingChanges: Bool = false
 

TablePro/Models/Query/QueryTab.swift

@@ -369,6 +369,16 @@ struct QueryTab: Identifiable, Equatable {
     // Whether this tab is a preview (temporary) tab that gets replaced on next navigation
     var isPreview: Bool
 
+    // Multi-result-set support (Phase 0: added alongside existing single-result properties)
+    var resultSets: [ResultSet] = []
+    var activeResultSetId: UUID?
+    var isResultsCollapsed: Bool = false
+
+    var activeResultSet: ResultSet? {
+        guard let id = activeResultSetId else { return resultSets.last }
+        return resultSets.first { $0.id == id }
+    }
+
     // Source file URL for .sql files opened from disk (used for deduplication)
     var sourceFileURL: URL?
 
@@ -542,6 +552,9 @@ struct QueryTab: Identifiable, Equatable {
             && lhs.rowsAffected == rhs.rowsAffected
             && lhs.isPreview == rhs.isPreview
             && lhs.hasUserInteraction == rhs.hasUserInteraction
+            && lhs.isResultsCollapsed == rhs.isResultsCollapsed
+            && lhs.resultSets.map(\.id) == rhs.resultSets.map(\.id)
+            && lhs.activeResultSetId == rhs.activeResultSetId
     }
 }
 

TablePro/Models/Query/ResultSet.swift

@@ -0,0 +1,46 @@
+//
+//  ResultSet.swift
+//  TablePro
+//
+//  A single result set from one SQL statement execution.
+//
+
+import Foundation
+import Observation
+import os
+
+@MainActor
+@Observable
+final class ResultSet: Identifiable {
+    let id: UUID
+    var label: String
+    var rowBuffer: RowBuffer
+    var executionTime: TimeInterval?
+    var rowsAffected: Int = 0
+    var errorMessage: String?
+    var statusMessage: String?
+    var tableName: String?
+    var isEditable: Bool = false
+    var isPinned: Bool = false
+    var resultVersion: Int = 0
+    var metadataVersion: Int = 0
+    var sortState = SortState()
+    var pagination = PaginationState()
+    var columnLayout = ColumnLayoutState()
+
+    // Column metadata
+    var columnTypes: [ColumnType] = []
+    var columnDefaults: [String: String?] = [:]
+    var columnForeignKeys: [String: ForeignKeyInfo] = [:]
+    var columnEnumValues: [String: [String]] = [:]
+    var columnNullable: [String: Bool] = [:]
+
+    var resultColumns: [String] { rowBuffer.columns }
+    var resultRows: [[String?]] { rowBuffer.rows }
+
+    init(id: UUID = UUID(), label: String, rowBuffer: RowBuffer = RowBuffer()) {
+        self.id = id
+        self.label = label
+        self.rowBuffer = rowBuffer
+    }
+}

TablePro/Models/UI/KeyboardShortcutModels.swift

@@ -71,6 +71,10 @@ enum ShortcutAction: String, Codable, CaseIterable, Identifiable {
     case toggleInspector
     case toggleFilters
     case toggleHistory
+    case toggleResults
+    case previousResultTab
+    case nextResultTab
+    case closeResultTab
 
     // Tabs
     case showPreviousTabBrackets
@@ -94,7 +98,8 @@ enum ShortcutAction: String, Codable, CaseIterable, Identifiable {
              .delete, .selectAll, .clearSelection, .addRow,
              .duplicateRow, .truncateTable:
             return .edit
-        case .toggleTableBrowser, .toggleInspector, .toggleFilters, .toggleHistory:
+        case .toggleTableBrowser, .toggleInspector, .toggleFilters, .toggleHistory,
+             .toggleResults, .previousResultTab, .nextResultTab, .closeResultTab:
             return .view
         case .showPreviousTabBrackets, .showNextTabBrackets,
              .previousTabArrows, .nextTabArrows:
@@ -137,6 +142,10 @@ enum ShortcutAction: String, Codable, CaseIterable, Identifiable {
         case .toggleInspector: return String(localized: "Toggle Inspector")
         case .toggleFilters: return String(localized: "Toggle Filters")
         case .toggleHistory: return String(localized: "Toggle History")
+        case .toggleResults: return String(localized: "Toggle Results")
+        case .previousResultTab: return String(localized: "Previous Result")
+        case .nextResultTab: return String(localized: "Next Result")
+        case .closeResultTab: return String(localized: "Close Result Tab")
         case .showPreviousTabBrackets: return String(localized: "Show Previous Tab")
         case .showNextTabBrackets: return String(localized: "Show Next Tab")
         case .previousTabArrows: return String(localized: "Previous Tab (Alt)")
@@ -440,6 +449,10 @@ struct KeyboardSettings: Codable, Equatable {
         .toggleInspector: KeyCombo(key: "b", command: true, shift: true),
         .toggleFilters: KeyCombo(key: "f", command: true),
         .toggleHistory: KeyCombo(key: "y", command: true),
+        .toggleResults: KeyCombo(key: "r", command: true, option: true),
+        .previousResultTab: KeyCombo(key: "[", command: true),
+        .nextResultTab: KeyCombo(key: "]", command: true),
+        .closeResultTab: KeyCombo(key: "w", command: true, shift: true),
 
         // Tabs
         .showPreviousTabBrackets: KeyCombo(key: "[", command: true, shift: true),