feat(sidebar): show BigQuery datasets as an expandable tree

CHANGELOG.md

@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- BigQuery: switching to another table now loads its data right away, instead of leaving the grid empty until you close and reopen the tab.
 - Custom and OpenAI-compatible AI providers now work when the base URL already ends in `/v1`, instead of building a doubled `/v1/v1/` path that failed. (#1400)
 - MongoDB: opening a collection no longer crashes when a document contains a NaN or infinite number. (#1418)
 - Opening a saved connection that fails now shows the detailed troubleshooting dialog with suggested fixes, the same one Test Connection shows, instead of a generic error alert. (#1425, #483)

Packages/TableProCore/Sources/TableProPluginKit/GroupingStrategy.swift

@@ -4,4 +4,5 @@ public enum GroupingStrategy: String, Codable, Sendable {
     case byDatabase
     case bySchema
     case flat
+    case hierarchicalSchema
 }

Packages/TableProCore/Sources/TableProPluginKit/PluginDatabaseDriver.swift

@@ -112,6 +112,24 @@ public protocol PluginDatabaseDriver: AnyObject, Sendable {
         limit: Int,
         offset: Int
     ) -> String?
+    func buildBrowseQuery(
+        table: String,
+        schema: String?,
+        sortColumns: [(columnIndex: Int, ascending: Bool)],
+        columns: [String],
+        limit: Int,
+        offset: Int
+    ) -> String?
+    func buildFilteredQuery(
+        table: String,
+        schema: String?,
+        filters: [(column: String, op: String, value: String)],
+        logicMode: String,
+        sortColumns: [(columnIndex: Int, ascending: Bool)],
+        columns: [String],
+        limit: Int,
+        offset: Int
+    ) -> String?
     // Filtered row count (optional, for NoSQL plugins; SQL plugins use COUNT(*) WHERE)
     func fetchFilteredRowCount(
         table: String,
@@ -177,6 +195,7 @@ public protocol PluginDatabaseDriver: AnyObject, Sendable {
 
     // Default export query (optional)
     func defaultExportQuery(table: String) -> String?
+    func defaultExportQuery(table: String, schema: String?) -> String?
 
     // Streaming row fetch for export
     func streamRows(query: String) -> AsyncThrowingStream<PluginStreamElement, Error>
@@ -305,6 +324,28 @@ public extension PluginDatabaseDriver {
         limit: Int,
         offset: Int
     ) -> String? { nil }
+    func buildBrowseQuery(
+        table: String,
+        schema: String?,
+        sortColumns: [(columnIndex: Int, ascending: Bool)],
+        columns: [String],
+        limit: Int,
+        offset: Int
+    ) -> String? {
+        buildBrowseQuery(table: table, sortColumns: sortColumns, columns: columns, limit: limit, offset: offset)
+    }
+    func buildFilteredQuery(
+        table: String,
+        schema: String?,
+        filters: [(column: String, op: String, value: String)],
+        logicMode: String,
+        sortColumns: [(columnIndex: Int, ascending: Bool)],
+        columns: [String],
+        limit: Int,
+        offset: Int
+    ) -> String? {
+        buildFilteredQuery(table: table, filters: filters, logicMode: logicMode, sortColumns: sortColumns, columns: columns, limit: limit, offset: offset)
+    }
     func fetchFilteredRowCount(
         table: String,
         filters: [(column: String, op: String, value: String)],
@@ -356,6 +397,7 @@ public extension PluginDatabaseDriver {
     func castColumnToText(_ column: String) -> String { column }
     func allTablesMetadataSQL(schema: String?) -> String? { nil }
     func defaultExportQuery(table: String) -> String? { nil }
+    func defaultExportQuery(table: String, schema: String?) -> String? { defaultExportQuery(table: table) }
 
     func quoteIdentifier(_ name: String) -> String {
         let escaped = name.replacingOccurrences(of: "\"", with: "\"\"")

Plugins/BigQueryDriverPlugin/BigQueryPlugin.swift

@@ -43,7 +43,7 @@ final class BigQueryPlugin: NSObject, TableProPlugin, DriverPlugin {
     static let tableEntityName = "Tables"
     static let supportsForeignKeyDisable = false
     static let supportsReadOnlyMode = true
-    static let databaseGroupingStrategy: GroupingStrategy = .bySchema
+    static let databaseGroupingStrategy: GroupingStrategy = .hierarchicalSchema
     static let defaultGroupName = "default"
     static let defaultPrimaryKeyColumn: String? = nil
     static let structureColumnFields: [StructureColumnField] = [.name, .type, .nullable, .comment]

Plugins/BigQueryDriverPlugin/BigQueryPluginDriver.swift

@@ -81,8 +81,12 @@ internal final class BigQueryPluginDriver: PluginDatabaseDriver, @unchecked Send
     }
 
     func defaultExportQuery(table: String) -> String? {
+        defaultExportQuery(table: table, schema: nil)
+    }
+
+    func defaultExportQuery(table: String, schema: String?) -> String? {
         guard let conn = connection else { return nil }
-        let dataset = lock.withLock { _currentDataset } ?? ""
+        let dataset = schema ?? (lock.withLock { _currentDataset }) ?? ""
         return "SELECT * FROM `\(conn.projectId).\(dataset).\(table)`"
     }
 
@@ -494,9 +498,23 @@ internal final class BigQueryPluginDriver: PluginDatabaseDriver, @unchecked Send
         columns: [String],
         limit: Int,
         offset: Int
+    ) -> String? {
+        buildBrowseQuery(
+            table: table, schema: nil, sortColumns: sortColumns,
+            columns: columns, limit: limit, offset: offset
+        )
+    }
+
+    func buildBrowseQuery(
+        table: String,
+        schema: String?,
+        sortColumns: [(columnIndex: Int, ascending: Bool)],
+        columns: [String],
+        limit: Int,
+        offset: Int
     ) -> String? {
         let dataset: String = lock.withLock {
-            let ds = _currentDataset ?? ""
+            let ds = schema ?? _currentDataset ?? ""
             _columnCache["\(ds).\(table)"] = columns
             return ds
         }
@@ -514,9 +532,25 @@ internal final class BigQueryPluginDriver: PluginDatabaseDriver, @unchecked Send
         columns: [String],
         limit: Int,
         offset: Int
+    ) -> String? {
+        buildFilteredQuery(
+            table: table, schema: nil, filters: filters, logicMode: logicMode,
+            sortColumns: sortColumns, columns: columns, limit: limit, offset: offset
+        )
+    }
+
+    func buildFilteredQuery(
+        table: String,
+        schema: String?,
+        filters: [(column: String, op: String, value: String)],
+        logicMode: String,
+        sortColumns: [(columnIndex: Int, ascending: Bool)],
+        columns: [String],
+        limit: Int,
+        offset: Int
     ) -> String? {
         let dataset: String = lock.withLock {
-            let ds = _currentDataset ?? ""
+            let ds = schema ?? _currentDataset ?? ""
             _columnCache["\(ds).\(table)"] = columns
             return ds
         }

Plugins/BigQueryDriverPlugin/Info.plist

@@ -5,6 +5,6 @@
 	<key>TableProMinAppVersion</key>
 	<string>0.42.0</string>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 </dict>
 </plist>

Plugins/CSVExportPlugin/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 	<key>TableProProvidesExportFormatIds</key>
 	<array>
 		<string>csv</string>

Plugins/CassandraDriverPlugin/Info.plist

@@ -21,6 +21,6 @@
 	<key>NSPrincipalClass</key>
 	<string>$(PRODUCT_MODULE_NAME).CassandraPlugin</string>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 </dict>
 </plist>

Plugins/ClickHouseDriverPlugin/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 	<key>TableProProvidesDatabaseTypeIds</key>
 	<array>
 		<string>ClickHouse</string>

Plugins/CloudflareD1DriverPlugin/Info.plist

@@ -5,6 +5,6 @@
 	<key>TableProMinAppVersion</key>
 	<string>0.42.0</string>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 </dict>
 </plist>

Plugins/DuckDBDriverPlugin/Info.plist

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 </dict>
 </plist>

Plugins/DynamoDBDriverPlugin/Info.plist

@@ -5,6 +5,6 @@
 	<key>TableProMinAppVersion</key>
 	<string>0.42.0</string>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 </dict>
 </plist>

Plugins/EtcdDriverPlugin/Info.plist

@@ -5,6 +5,6 @@
 	<key>TableProMinAppVersion</key>
 	<string>0.42.0</string>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 </dict>
 </plist>

Plugins/JSONExportPlugin/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 	<key>TableProProvidesExportFormatIds</key>
 	<array>
 		<string>json</string>

Plugins/LibSQLDriverPlugin/Info.plist

@@ -5,6 +5,6 @@
 	<key>TableProMinAppVersion</key>
 	<string>0.42.0</string>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 </dict>
 </plist>

Plugins/MQLExportPlugin/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 	<key>TableProProvidesExportFormatIds</key>
 	<array>
 		<string>mql</string>

Plugins/MSSQLDriverPlugin/Info.plist

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 </dict>
 </plist>

Plugins/MongoDBDriverPlugin/Info.plist

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 </dict>
 </plist>

Plugins/MySQLDriverPlugin/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 	<key>TableProProvidesDatabaseTypeIds</key>
 	<array>
 		<string>MySQL</string>

Plugins/OracleDriverPlugin/Info.plist

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 </dict>
 </plist>

Plugins/PostgreSQLDriverPlugin/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 	<key>TableProProvidesDatabaseTypeIds</key>
 	<array>
 		<string>PostgreSQL</string>

Plugins/RedisDriverPlugin/Info.plist

@@ -21,7 +21,7 @@
 	<key>NSPrincipalClass</key>
 	<string>$(PRODUCT_MODULE_NAME).RedisPlugin</string>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 	<key>TableProProvidesDatabaseTypeIds</key>
 	<array>
 		<string>Redis</string>

Plugins/SQLExportPlugin/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 	<key>TableProProvidesExportFormatIds</key>
 	<array>
 		<string>sql</string>

Plugins/SQLImportPlugin/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 	<key>TableProProvidesImportFormatIds</key>
 	<array>
 		<string>sql</string>

Plugins/SQLiteDriverPlugin/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 	<key>TableProProvidesDatabaseTypeIds</key>
 	<array>
 		<string>SQLite</string>

Plugins/TableProPluginKit/GroupingStrategy.swift

@@ -7,4 +7,5 @@ public enum GroupingStrategy: String, Codable, Sendable {
     case byDatabase
     case bySchema
     case flat
+    case hierarchicalSchema
 }

Plugins/TableProPluginKit/PluginDatabaseDriver.swift

@@ -88,6 +88,8 @@ public protocol PluginDatabaseDriver: AnyObject, Sendable {
     // Query building (optional, for NoSQL plugins)
     func buildBrowseQuery(table: String, sortColumns: [(columnIndex: Int, ascending: Bool)], columns: [String], limit: Int, offset: Int) -> String?
     func buildFilteredQuery(table: String, filters: [(column: String, op: String, value: String)], logicMode: String, sortColumns: [(columnIndex: Int, ascending: Bool)], columns: [String], limit: Int, offset: Int) -> String?
+    func buildBrowseQuery(table: String, schema: String?, sortColumns: [(columnIndex: Int, ascending: Bool)], columns: [String], limit: Int, offset: Int) -> String?
+    func buildFilteredQuery(table: String, schema: String?, filters: [(column: String, op: String, value: String)], logicMode: String, sortColumns: [(columnIndex: Int, ascending: Bool)], columns: [String], limit: Int, offset: Int) -> String?
     // Filtered row count (optional, for NoSQL plugins; SQL plugins use COUNT(*) WHERE)
     func fetchFilteredRowCount(table: String, filters: [(column: String, op: String, value: String)], logicMode: String) async throws -> Int?
     // Statement generation (optional, for NoSQL plugins)
@@ -141,6 +143,7 @@ public protocol PluginDatabaseDriver: AnyObject, Sendable {
 
     // Default export query (optional — returns nil to use app-level fallback)
     func defaultExportQuery(table: String) -> String?
+    func defaultExportQuery(table: String, schema: String?) -> String?
 
     // Streaming row fetch for export
     func streamRows(query: String) -> AsyncThrowingStream<PluginStreamElement, Error>
@@ -251,6 +254,12 @@ public extension PluginDatabaseDriver {
 
     func buildBrowseQuery(table: String, sortColumns: [(columnIndex: Int, ascending: Bool)], columns: [String], limit: Int, offset: Int) -> String? { nil }
     func buildFilteredQuery(table: String, filters: [(column: String, op: String, value: String)], logicMode: String, sortColumns: [(columnIndex: Int, ascending: Bool)], columns: [String], limit: Int, offset: Int) -> String? { nil }
+    func buildBrowseQuery(table: String, schema: String?, sortColumns: [(columnIndex: Int, ascending: Bool)], columns: [String], limit: Int, offset: Int) -> String? {
+        buildBrowseQuery(table: table, sortColumns: sortColumns, columns: columns, limit: limit, offset: offset)
+    }
+    func buildFilteredQuery(table: String, schema: String?, filters: [(column: String, op: String, value: String)], logicMode: String, sortColumns: [(columnIndex: Int, ascending: Bool)], columns: [String], limit: Int, offset: Int) -> String? {
+        buildFilteredQuery(table: table, filters: filters, logicMode: logicMode, sortColumns: sortColumns, columns: columns, limit: limit, offset: offset)
+    }
     func fetchFilteredRowCount(table: String, filters: [(column: String, op: String, value: String)], logicMode: String) async throws -> Int? { nil }
     func generateStatements(table: String, columns: [String], primaryKeyColumns: [String], changes: [PluginRowChange], insertedRowData: [Int: [PluginCellValue]], deletedRowIndices: Set<Int>, insertedRowIndices: Set<Int>) -> [(statement: String, parameters: [PluginCellValue])]? { nil }
 
@@ -284,6 +293,7 @@ public extension PluginDatabaseDriver {
     func castColumnToText(_ column: String) -> String { column }
     func allTablesMetadataSQL(schema: String?) -> String? { nil }
     func defaultExportQuery(table: String) -> String? { nil }
+    func defaultExportQuery(table: String, schema: String?) -> String? { defaultExportQuery(table: table) }
 
     func quoteIdentifier(_ name: String) -> String {
         let escaped = name.replacingOccurrences(of: "\"", with: "\"\"")

Plugins/XLSXExportPlugin/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>TableProPluginKitVersion</key>
-	<integer>15</integer>
+	<integer>16</integer>
 	<key>TableProProvidesExportFormatIds</key>
 	<array>
 		<string>xlsx</string>

TablePro/Core/Plugins/ExportDataSourceAdapter.swift

@@ -23,7 +23,7 @@ final class ExportDataSourceAdapter: PluginExportDataSource, @unchecked Sendable
     func streamRows(table: String, databaseName: String) -> AsyncThrowingStream<PluginStreamElement, Error> {
         let query: String
         if let pluginDriver = (driver as? PluginDriverAdapter)?.schemaPluginDriver,
-           let customQuery = pluginDriver.defaultExportQuery(table: table) {
+           let customQuery = pluginDriver.defaultExportQuery(table: table, schema: databaseName.isEmpty ? nil : databaseName) {
             query = customQuery
         } else {
             let tableRef = qualifiedTableRef(table: table, databaseName: databaseName)

TablePro/Core/Plugins/PluginManager.swift

@@ -13,7 +13,7 @@ import TableProPluginKit
 @MainActor @Observable
 final class PluginManager {
     static let shared = PluginManager()
-    static let currentPluginKitVersion = 15
+    static let currentPluginKitVersion = 16
     static let currentInspectorKitVersion = 1
     private static let disabledPluginsKey = "com.TablePro.disabledPlugins"
     private static let legacyDisabledPluginsKey = "disabledPlugins"