@@ -2,86 +2,23 @@ import Foundation
2import SwiftUI
2import SwiftUI
6final class QueryViewModel {
5final class QueryViewModel {
7− var sqlQuery = "" {
6+ var sqlQuery = ""
9− // Editing the query invalidates any error underline, whose offsets
10− // were computed against the previous text. Clearing here keeps a
11− // late-arriving highlight from landing on the wrong position.
12− if sqlQuery != oldValue { errorRange = nil }
15 var results: [LogRecord] = [] {
7 var results: [LogRecord] = [] {
17− // Build search texts asynchronously
18− searchTextTask?.cancel()
19− cachedSearchTexts = []
9+ cachedSearchTexts = results.map { record in
20− searchTextGeneration &+= 1
21− let generation = searchTextGeneration
22− // Apply the current filter immediately using the inline fallback path
23− // (the cache was just invalidated). Calling updateFilteredResults()
24− // rather than `filteredResults = results` avoids briefly showing
25− // unfiltered rows while a filter is active, and avoids leaving a stale
26− // unfiltered set if the async rebuild below is cancelled before it
27− // re-applies the filter.
28− updateFilteredResults()
29− let snapshot = results
30− // The class is @MainActor, so this Task inherits main-actor isolation —
31− // its mutations of cachedSearchTexts/filteredResults are safely serialized
32− // with SwiftUI reads. Only the pure (and potentially large) displayString
33− // mapping is pushed off-main via Task.detached so it doesn't block the UI.
34− searchTextTask = Task { [weak self] in
35− let texts = await Task.detached(priority: .userInitiated) {
36− snapshot.map { record in
37− record.values.map { $0.displayString }.joined(separator: " ")
10+ record.values.map { $0.displayString }.joined(separator: " ")
40− guard let self, !Task.isCancelled else { return }
41− // Reject a stale write: if `results` was reassigned while this task
42− // was awaiting, a newer didSet bumped the generation. Task.isCancelled
43− // alone isn't sufficient because two re-queries producing result sets
44− // of identical count would otherwise let this stale, same-length
45− // cachedSearchTexts slip past updateFilteredResults's count guard.
46− guard generation == self.searchTextGeneration else { return }
47− self.cachedSearchTexts = texts
48− if !self.filterText.isEmpty {
49− self.updateFilteredResults()
12+ updateFilteredResults()
54 private var cachedSearchTexts: [String] = []
15 private var cachedSearchTexts: [String] = []
55− private var searchTextTask: Task<Void, Never>?
56− /// Bumped on every `results` reassignment so the async search-text builder can
57− /// detect it was superseded and drop a stale write (see results.didSet).
58− private var searchTextGeneration = 0
59 var columns: [String] = []
16 var columns: [String] = []
60 var columnOrder: [String] = []
17 var columnOrder: [String] = []
61 var hiddenColumns: Set<String> = []
18 var hiddenColumns: Set<String> = []
62− /// The full persisted set of hidden columns for the current stream, including
63− /// ones absent from the current result. Hiding a column drops it from the
64− /// SELECT list, so it's missing from the very next result and `hiddenColumns`
65− /// (only the columns present) forgets it — the next save would then erase the
66− /// preference. This keeps the intent, mirroring LiveTailViewModel.
67− private(set) var savedHiddenColumns: Set<String> = []
68− /// The persisted column order including columns absent from the current
69− /// result (the order counterpart of `savedHiddenColumns`), so saving doesn't
70− /// drop a hidden column's position and it returns to its place when shown.
71− private var savedColumnOrder: [String] = []
72 var autoHiddenColumns: Set<String> = []
19 var autoHiddenColumns: Set<String> = []
73 /// Column config from a saved query, applied on next query execution.
20 /// Column config from a saved query, applied on next query execution.
74 var pendingColumnConfig: ColumnConfiguration?
21 var pendingColumnConfig: ColumnConfiguration?
76− /// The connection and stream the editor text and results belong to. The view
77− /// model outlives QueryView (switching tabs keeps the query), so the view
78− /// compares this on appear to catch a stream/server change made while another
80− struct BoundContext: Equatable {
81− let connectionID: UUID?
84− var boundContext: BoundContext?
85 private var currentStream: String?
22 private var currentStream: String?
86 var isLoading = false
23 var isLoading = false
87 var errorMessage: String?
24 var errorMessage: String?
@@ -97,25 +34,9 @@ final class QueryViewModel {
98 // Schema fields for autocomplete
35 // Schema fields for autocomplete
99 var schemaFields: [SchemaField] = []
36 var schemaFields: [SchemaField] = []
100− /// The stream of the most recent `loadSchema` call, used to drop a stale
101− /// in-flight response when the user rapidly switches streams.
102− private(set) var latestSchemaStream: String?
103− /// The stream of the most recent `executeQuery` call. Defense-in-depth
104− /// alongside `queryGeneration`/task cancellation: drops a stale in-flight
105− /// query response if a newer query for a different stream supersedes it
106− /// without going through the normal cancel path.
107− private var latestQueryStream: String?
109 // Query task for cancellation
38 // Query task for cancellation
110 private var queryTask: Task<Void, Never>?
39 private var queryTask: Task<Void, Never>?
111− /// Bumped at the start of every `executeQuery`. The task captures this value
112− /// and only clears `isLoading` on exit if it's still the active query — so a
113− /// superseded query's late cleanup doesn't drop the loading indicator that
114− /// the newer query set. Without this, `isLoading = false` had to live in
115− /// every caller of `cancel()` (cancelQuery, clearResults, superseding
116− /// executeQuery) and a future cancel path that forgot to set it would wedge
117− /// the spinner indefinitely.
118− private var queryGeneration = 0
120 // Time range
41 // Time range
121 var timeRangeOption: TimeRangeOption = .last1Hour
42 var timeRangeOption: TimeRangeOption = .last1Hour
@@ -124,10 +45,7 @@ final class QueryViewModel {
125 // Query history
46 // Query history
126 var queryHistory: [QueryHistoryEntry] = []
47 var queryHistory: [QueryHistoryEntry] = []
127− // Derived from the (always-trimmed) history so it stays correct after a
128− // restored full history is loaded at launch, not just after an in-session
129− // overflow. `addToHistory` trims to `maxHistory`, so count never exceeds it.
130− var historyIsFull: Bool { queryHistory.count >= Self.maxHistory }
48+ var historyIsFull = false
131 private static let maxHistory = 50
49 private static let maxHistory = 50
133 struct QueryHistoryEntry: Identifiable, Codable, Sendable {
51 struct QueryHistoryEntry: Identifiable, Codable, Sendable {
@@ -212,16 +130,9 @@ final class QueryViewModel {
212 return columnOrder.filter { !allHidden.contains($0) }
130 return columnOrder.filter { !allHidden.contains($0) }
215− /// Whether any column is hidden — including saved-hidden columns that aren't
216− /// in the current result, which "Show All" can bring back.
217− var hasHiddenColumns: Bool {
218− !hiddenColumns.isEmpty || !autoHiddenColumns.isEmpty || !savedHiddenColumns.isEmpty
221 func toggleColumnVisibility(_ column: String) {
133 func toggleColumnVisibility(_ column: String) {
222 if hiddenColumns.contains(column) {
134 if hiddenColumns.contains(column) {
223 hiddenColumns.remove(column)
135 hiddenColumns.remove(column)
224− savedHiddenColumns.remove(column)
225 } else if autoHiddenColumns.contains(column) {
136 } else if autoHiddenColumns.contains(column) {
226 autoHiddenColumns.remove(column)
137 autoHiddenColumns.remove(column)
@@ -230,7 +141,6 @@ final class QueryViewModel {
230 let visibleCount = columnOrder.count - allHidden.count
141 let visibleCount = columnOrder.count - allHidden.count
231 if visibleCount > 1 {
142 if visibleCount > 1 {
232 hiddenColumns.insert(column)
143 hiddenColumns.insert(column)
233− savedHiddenColumns.insert(column)
236 saveColumnConfig()
146 saveColumnConfig()
@@ -239,7 +149,6 @@ final class QueryViewModel {
240 func showAllColumns() {
150 func showAllColumns() {
241 hiddenColumns.removeAll()
151 hiddenColumns.removeAll()
242− savedHiddenColumns.removeAll()
243 autoHiddenColumns.removeAll()
152 autoHiddenColumns.removeAll()
244 saveColumnConfig()
153 saveColumnConfig()
245 updateSQLColumns()
154 updateSQLColumns()
@@ -256,129 +165,36 @@ final class QueryViewModel {
256 let toIndex = columnOrder.firstIndex(of: targetColumn),
165 let toIndex = columnOrder.firstIndex(of: targetColumn),
257 fromIndex != toIndex else { return }
166 fromIndex != toIndex else { return }
258 let item = columnOrder.remove(at: fromIndex)
167 let item = columnOrder.remove(at: fromIndex)
259− // Match the drop-indicator semantics: a rightward move (fromIndex < toIndex)
260− // lands the column *after* the target, a leftward move lands it *before*.
261− // After removing an earlier element the target shifts down by one, so
262− // inserting at `toIndex` lands after the target for rightward moves; for
263− // leftward moves the target is unshifted and `toIndex` lands before it.
264− let adjusted = toIndex
265− columnOrder.insert(item, at: adjusted)
168+ columnOrder.insert(item, at: toIndex)
266 saveColumnConfig()
169 saveColumnConfig()
267 updateSQLColumns()
170 updateSQLColumns()
270 func resetColumnConfig() {
173 func resetColumnConfig() {
271 columnOrder = columns
174 columnOrder = columns
272− savedColumnOrder = []
273 hiddenColumns.removeAll()
175 hiddenColumns.removeAll()
274− savedHiddenColumns.removeAll()
275 autoHiddenColumns.removeAll()
176 autoHiddenColumns.removeAll()
276 saveColumnConfig()
177 saveColumnConfig()
277 updateSQLColumns()
178 updateSQLColumns()
280− /// Rewrites the SELECT clause of `sqlQuery` to reflect the user's column
181+ /// Rewrites the SELECT clause of `sqlQuery` to reflect the current `visibleColumns`.
281− /// choices (order and hidden columns; auto-hidden columns stay display-only).
282 func updateSQLColumns() {
182 func updateSQLColumns() {
283− guard let range = SQLTokenizer.selectColumnListRange(in: sqlQuery),
183+ guard let range = SQLTokenizer.selectColumnListRange(in: sqlQuery) else { return }
284− let currentList = Self.parseColumnList(sqlQuery[range]) else { return }
286− // Project the user's choices only. `autoHiddenColumns` is a display
287− // heuristic for the current rows (the field is empty in all of them);
288− // baking it into the SQL would stop the field from ever being fetched
289− // again, even for a time range where it has values.
290− let visible = columnOrder.filter { !hiddenColumns.contains($0) }
291− guard !visible.isEmpty else { return }
293− // Columns an explicit list names that aren't in the results: Parseable
185+ let visible = visibleColumns
294− // omits all-null fields from query JSON, so a sparse listed field can be
186+ guard !visible.isEmpty else { return }
295− // missing from `columns`. Keep it (unless the user hid it) rather than
296− // silently dropping it from the SELECT on the next rewrite.
297− var listedButAbsent: [String] = []
298− var excludesHiddenColumn = false
299− if case .identifiers(let names) = currentList {
300− let present = Set(columns)
301− listedButAbsent = names.filter { !present.contains($0) && !savedHiddenColumns.contains($0) }
302− // A column the user hid is absent from these results precisely
303− // because this list was narrowed to exclude it.
304− excludesHiddenColumn = !savedHiddenColumns.isSubset(of: present)
307 let newColumnList: String
188 let newColumnList: String
308− // Use `*` whenever every column is visible, regardless of display order —
189+ if visible == columns {
309− // reordering columns (a set-preserving permutation) must not pin the query
310− // to an explicit snapshot that hides newly-appearing fields on re-query —
311− // unless the list is explicit because it leaves out a hidden column, which
312− // `*` would fetch again.
313− if !excludesHiddenColumn && visible.count == columns.count && Set(visible) == Set(columns) {
314 newColumnList = "*"
190 newColumnList = "*"
316− newColumnList = (visible + listedButAbsent).map { Self.escapeSQLIdentifier($0) }.joined(separator: ", ")
192+ newColumnList = visible.map { Self.escapeSQLIdentifier($0) }.joined(separator: ", ")
319 sqlQuery.replaceSubrange(range, with: newColumnList)
195 sqlQuery.replaceSubrange(range, with: newColumnList)
322− enum ColumnListShape: Equatable {
324− /// Plain column references, as the column names they resolve to.
325− case identifiers([String])
328− /// Parses a SELECT list the column manager can regenerate without changing
329− /// what the query computes: `*`, or a comma-separated list of plain column
330− /// references. Anything else — aggregates, expressions, aliases
331− /// (`count(*) AS n`), qualified names — returns nil: rewriting it with `*` or
332− /// bare result keys would break the query, so the column manager then only
333− /// hides/reorders client-side.
334− nonisolated static func parseColumnList(_ list: Substring) -> ColumnListShape? {
335− let tokens = SQLTokenizer.tokenize(String(list)).filter { !$0.kind.isTrivia }
336− if tokens.count == 1, tokens[0].kind == .star { return .star }
337− guard tokens.count % 2 == 1 else { return nil }
338− var names: [String] = []
339− for (index, token) in tokens.enumerated() {
341− guard token.kind == .comma else { return nil }
345− // DataFusion folds unquoted identifiers to lowercase.
346− case .identifier(let name): names.append(name.lowercased())
347− case .quotedIdentifier(let name): names.append(name)
351− return .identifiers(names)
354− /// Inserts `newColumns` into `order`, placing each one that appears in
355− /// `reference` (a saved order) right after its nearest saved predecessor
356− /// that's already placed — or first if none is — and appending the rest.
357− /// Used to keep the positions of columns that are absent for a while.
358− nonisolated static func mergedColumnOrder(
359− _ order: [String], inserting newColumns: [String], reference: [String]
362− let referenceIndex = Dictionary(reference.enumerated().map { ($1, $0) }, uniquingKeysWith: { first, _ in first })
363− let pending = newColumns.filter { referenceIndex[$0] == nil }
364− let positioned = newColumns
365− .filter { referenceIndex[$0] != nil }
366− .sorted { referenceIndex[$0]! < referenceIndex[$1]! }
367− for column in positioned where !result.contains(column) {
368− let savedIndex = referenceIndex[column]!
369− let predecessor = reference[..<savedIndex].reversed().first { result.contains($0) }
370− if let predecessor, let position = result.firstIndex(of: predecessor) {
371− result.insert(column, at: position + 1)
373− result.insert(column, at: 0)
376− for column in pending where !result.contains(column) {
377− result.append(column)
382 // MARK: - Column Configuration Persistence
198 // MARK: - Column Configuration Persistence
384 struct ColumnConfiguration: Codable {
200 struct ColumnConfiguration: Codable {
@@ -392,16 +208,7 @@ final class QueryViewModel {
393 private func saveColumnConfig() {
209 private func saveColumnConfig() {
394 guard let stream = currentStream else { return }
210 guard let stream = currentStream else { return }
395− // Persist the full intended hidden set and order, not just the currently
396− // present columns (see `savedHiddenColumns` / `savedColumnOrder`).
397− let present = Set(columnOrder)
398− let order = Self.mergedColumnOrder(
400− inserting: savedColumnOrder.filter { !present.contains($0) },
401− reference: savedColumnOrder
403− savedColumnOrder = order
404− let config = ColumnConfiguration(order: order, hidden: savedHiddenColumns.union(hiddenColumns))
211+ let config = ColumnConfiguration(order: columnOrder, hidden: hiddenColumns)
405 if let data = try? JSONEncoder().encode(config) {
212 if let data = try? JSONEncoder().encode(config) {
406 UserDefaults.standard.set(data, forKey: Self.columnConfigKey(for: stream))
213 UserDefaults.standard.set(data, forKey: Self.columnConfigKey(for: stream))
@@ -430,9 +237,7 @@ final class QueryViewModel {
431 guard let config else {
238 guard let config else {
432 columnOrder = extractedColumns
239 columnOrder = extractedColumns
433− savedColumnOrder = []
434 hiddenColumns = []
240 hiddenColumns = []
435− savedHiddenColumns = []
@@ -445,20 +250,7 @@ final class QueryViewModel {
445 merged.append(col)
250 merged.append(col)
447 columnOrder = merged
252 columnOrder = merged
448− savedColumnOrder = config.order
449− savedHiddenColumns = config.hidden
450 hiddenColumns = config.hidden.intersection(extractedSet)
253 hiddenColumns = config.hidden.intersection(extractedSet)
452− // The `visibleCount > 1` guard in toggleColumnVisibility only covers
453− // user toggles. A saved config can hide every currently-extracted column
454− // (e.g. the stream's schema shrank so only previously-hidden columns
455− // remain), which would render the results table with zero columns and
456− // leave `updateSQLColumns` early-returning on the empty case. Keep at
457− // least the first column visible. Mirrors LiveTailViewModel.updateColumns.
458− if !columnOrder.isEmpty, hiddenColumns.count >= columnOrder.count,
459− let firstColumn = columnOrder.first {
460− hiddenColumns.remove(firstColumn)
464 private(set) var filteredResults: [LogRecord] = []
256 private(set) var filteredResults: [LogRecord] = []
@@ -481,22 +273,8 @@ final class QueryViewModel {
481 filteredResults = results
273 filteredResults = results
483 let text = filterText
275 let text = filterText
484− // The search-text cache is built asynchronously, so it may be empty
485− // or stale when the filter changes. `zip` would silently truncate to
486− // the shorter sequence and drop matching rows, so only use the cache
487− // when it lines up with the current results; otherwise compute the
488− // search text inline for correctness.
489− if cachedSearchTexts.count == results.count {
490− filteredResults = zip(results, cachedSearchTexts).compactMap { record, searchText in
276+ filteredResults = zip(results, cachedSearchTexts).compactMap { record, searchText in
491− searchText.localizedCaseInsensitiveContains(text) ? record : nil
277+ searchText.localizedCaseInsensitiveContains(text) ? record : nil
494− filteredResults = results.filter { record in
496− .map { $0.displayString }
497− .joined(separator: " ")
498− .localizedCaseInsensitiveContains(text)
@@ -540,13 +318,6 @@ final class QueryViewModel {
541 // Cancel any in-flight query
319 // Cancel any in-flight query
542 queryTask?.cancel()
320 queryTask?.cancel()
543− // Bump the generation so the in-flight task's cleanup can detect that
544− // it has been superseded and skip its `isLoading = false` (which would
545− // otherwise race with the `isLoading = true` below and briefly drop
546− // the loading indicator during this query).
547− queryGeneration &+= 1
548− let generation = queryGeneration
549− latestQueryStream = stream
551 isLoading = true
322 isLoading = true
552 errorMessage = nil
323 errorMessage = nil
@@ -555,44 +326,18 @@ final class QueryViewModel {
555 let startTime = CFAbsoluteTimeGetCurrent()
326 let startTime = CFAbsoluteTimeGetCurrent()
557 let task = Task {
328 let task = Task {
558− // Always clear the spinner on exit when this is still the active
559− // query. The defer runs on every path (success, error, and the
560− // cancellation cases that previously returned before reaching the
561− // trailing `isLoading = false`), so the spinner can never wedge
562− // even if a new cancel path is added without resetting it.
564− if generation == queryGeneration {
569 try Task.checkCancellation()
330 try Task.checkCancellation()
570 let queryResults = try await client.query(sql: sql, startTime: startDate, endTime: endDate)
331 let queryResults = try await client.query(sql: sql, startTime: startDate, endTime: endDate)
571 try Task.checkCancellation()
332 try Task.checkCancellation()
572− // Re-check before committing. A superseding executeQuery() cancels
573− // this task (queryTask?.cancel()) before starting the next one, but
574− // cancellation landing just after the check above would otherwise
575− // let a stale query clobber the newer one's results/columns.
576− guard !Task.isCancelled else { return }
577− // Drop the response if a newer query (possibly for a different
578− // stream) has since been launched without cancelling this task.
579− guard latestQueryStream == stream else { return }
581 results = queryResults
334 results = queryResults
582− // Drop any prior row selection: the new result set reassigns row
583− // identities, so a retained selectedLogEntry would either dangle or
584− // value-match an unrelated row, leaving a stale detail inspector.
585− selectedLogEntry = nil
586 queryDuration = CFAbsoluteTimeGetCurrent() - startTime
335 queryDuration = CFAbsoluteTimeGetCurrent() - startTime
587 resultCount = results.count
336 resultCount = results.count
589− // Detect if results were likely truncated. We know the cap for
338+ // Detect if results were likely truncated (only meaningful
590− // auto-generated queries; for user-entered SQL (which includes the
339+ // for auto-generated queries where we control the LIMIT)
591− // default query `setDefaultQuery` writes into the editor — the common
340+ resultsTruncated = usedAutoLimit && results.count == limit
592− // stream-selection path), parse a trailing `LIMIT n` so the indicator
593− // still fires when the row count lands exactly on the limit.
594− let effectiveLimit = usedAutoLimit ? limit : Self.trailingLimit(in: sql)
595− resultsTruncated = effectiveLimit.map { results.count == $0 } ?? false
597 // Extract columns in a single pass, with priority fields first,
342 // Extract columns in a single pass, with priority fields first,
598 // then apply any saved column configuration for this stream
343 // then apply any saved column configuration for this stream
@@ -619,36 +364,19 @@ final class QueryViewModel {
620 } catch {
365 } catch {
621 guard !Task.isCancelled else { return }
366 guard !Task.isCancelled else { return }
622− // Same supersession guard as the success path: a stale failed
623− // query must not clobber a newer query's state.
624− guard latestQueryStream == stream else { return }
625 errorMessage = ParseableError.userFriendlyMessage(for: error)
367 errorMessage = ParseableError.userFriendlyMessage(for: error)
626 if let serverError = error as? ParseableError,
368 if let serverError = error as? ParseableError,
627 case .serverError(_, let msg) = serverError,
369 case .serverError(_, let msg) = serverError,
628− let pos = SQLErrorPosition.parse(from: msg),
370+ let pos = SQLErrorPosition.parse(from: msg) {
630− // The server's line/column is relative to the *submitted* SQL.
631− // Only map it back into the editor when the editor still holds
632− // that same text — if the user edited the query while it was in
633− // flight, the position no longer corresponds to what's displayed
634− // and would underline an unrelated span. (`sqlQuery`'s didSet
635− // already cleared errorRange on that edit, so leaving it nil here
636− // keeps the editor unmarked.)
637 errorRange = SQLTokenizer.errorHighlightRange(
371 errorRange = SQLTokenizer.errorHighlightRange(
638− line: pos.line, column: pos.column, in: sql
372+ line: pos.line, column: pos.column, in: sqlQuery
641 results = []
375 results = []
642 columns = []
376 columns = []
643− // Drop the previous query's column layout too, otherwise derived
644− // state like `visibleColumns` (and a CSV export reading it) would
645− // report stale column names after the failure.
648− savedHiddenColumns = []
649− savedColumnOrder = []
650− autoHiddenColumns = []
653 queryTask = task
381 queryTask = task
654 await task.value
382 await task.value
@@ -665,20 +393,14 @@ final class QueryViewModel {
666 @MainActor
394 @MainActor
667 func loadSchema(client: ParseableClient?, stream: String?) async {
395 func loadSchema(client: ParseableClient?, stream: String?) async {
668− latestSchemaStream = stream
669 guard let client, let stream else {
396 guard let client, let stream else {
670 schemaFields = []
397 schemaFields = []
674 let schema = try await client.getStreamSchema(stream: stream)
401 let schema = try await client.getStreamSchema(stream: stream)
675− // A newer load (e.g. a rapid stream switch) may have superseded this
676− // one; only commit if this is still the stream last requested,
677− // otherwise we'd show the wrong stream's fields in autocomplete.
678− guard latestSchemaStream == stream else { return }
679 schemaFields = schema.fields
402 schemaFields = schema.fields
680 } catch {
403 } catch {
681− guard latestSchemaStream == stream else { return }
682 // Schema load is best-effort; don't surface errors
404 // Schema load is best-effort; don't surface errors
683 schemaFields = []
405 schemaFields = []
@@ -708,9 +430,7 @@ final class QueryViewModel {
708 var empty = Set(columns)
430 var empty = Set(columns)
709 for record in records {
431 for record in records {
710 if empty.isEmpty { break }
432 if empty.isEmpty { break }
711− // Iterate a snapshot: mutating `empty` while iterating it directly
712− // is undefined behavior and can skip elements or trap.
713− for column in Array(empty) {
433+ for column in empty {
714 if let value = record[column], value != .null, value != .string("") {
434 if let value = record[column], value != .null, value != .string("") {
715 empty.remove(column)
435 empty.remove(column)
@@ -719,66 +439,41 @@ final class QueryViewModel {
719 return empty
439 return empty
722− /// Exports the on-screen rows as JSON. Uses `filteredResults` (not the full
723− /// `results`) so the output matches what the user sees with an active result
724− /// filter, mirroring the view's export path.
725 func exportAsJSON() -> String {
442 func exportAsJSON() -> String {
726− let rows = filteredResults
727− guard !rows.isEmpty else { return "[]" }
443+ guard !results.isEmpty else { return "[]" }
728 let encoder = JSONEncoder()
444 let encoder = JSONEncoder()
729 encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
445 encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
730− if let data = try? encoder.encode(Self.projectRecords(rows, to: visibleColumns)),
446+ if let data = try? encoder.encode(results),
731 let string = String(data: data, encoding: .utf8) {
447 let string = String(data: data, encoding: .utf8) {
732 return string
448 return string
734 return "[]"
450 return "[]"
737− /// Exports the on-screen rows as CSV. Uses `filteredResults` for the same
738− /// reason as `exportAsJSON`.
739 func exportAsCSV() -> String {
453 func exportAsCSV() -> String {
740− Self.buildCSV(records: filteredResults, columns: visibleColumns)
454+ Self.buildCSV(records: results, columns: visibleColumns)
743− /// Projects each record down to the given columns so JSON export, like CSV,
744− /// respects hidden columns instead of leaking every field. Safe to call from
746− nonisolated static func projectRecords(_ records: [LogRecord], to columns: [String]) -> [LogRecord] {
747− // No column list means no restriction (columns not computed yet) — export
748− // the full records rather than stripping every field to an empty object.
749− guard !columns.isEmpty else { return records }
750− let allowed = Set(columns)
751− return records.map { record in record.filter { allowed.contains($0.key) } }
754 /// Builds a CSV string from records and columns. Safe to call from any thread.
457 /// Builds a CSV string from records and columns. Safe to call from any thread.
755− nonisolated static func buildCSV(records: [LogRecord], columns: [String]) -> String {
458+ static func buildCSV(records: [LogRecord], columns: [String]) -> String {
756 guard !records.isEmpty, !columns.isEmpty else { return "" }
459 guard !records.isEmpty, !columns.isEmpty else { return "" }
758− var csv = String()
461+ var lines: [String] = []
759− csv.reserveCapacity(columns.count * 50 * (records.count + 1))
462+ lines.reserveCapacity(records.count + 1)
463+ lines.append(columns.map { escapeCSV($0) }.joined(separator: ","))
762− for (i, col) in columns.enumerated() {
763− if i > 0 { csv.append(",") }
764− csv.append(escapeCSV(col))
769 for record in records {
465 for record in records {
770− for (i, column) in columns.enumerated() {
466+ let row = columns.map { column in
771− if i > 0 { csv.append(",") }
772 let value = record[column]?.exportString ?? ""
467 let value = record[column]?.exportString ?? ""
773− csv.append(escapeCSV(value))
468+ return escapeCSV(value)
775− csv.append("\n")
470+ lines.append(row.joined(separator: ","))
778− return csv
473+ return lines.joined(separator: "\n") + "\n"
781− nonisolated private static func escapeCSV(_ value: String) -> String {
476+ private static func escapeCSV(_ value: String) -> String {
782 // Check at the Unicode scalar level to correctly detect \r and \n
477 // Check at the Unicode scalar level to correctly detect \r and \n
783 // inside \r\n (CRLF) grapheme clusters, which Swift's String.contains
478 // inside \r\n (CRLF) grapheme clusters, which Swift's String.contains
784 // treats as a single Character that doesn't match "\r" or "\n" alone.
479 // treats as a single Character that doesn't match "\r" or "\n" alone.
@@ -792,29 +487,10 @@ final class QueryViewModel {
794 func clearResults() {
489 func clearResults() {
795− // Cancel any in-flight work first. Without this, a query still running
796− // when the user switches streams or disconnects would pass its post-await
797− // cancellation check (it was never cancelled) and write its results +
798− // persist a column config for the *old* stream after this reset.
801− searchTextTask?.cancel()
802− searchTextTask = nil
803− filterTask?.cancel()
806− // The in-flight query was cancelled above, so its task returns via the
807− // CancellationError path and never reaches `isLoading = false`. Reset it
808− // here, otherwise deselecting the stream / disconnecting (which calls
809− // clearResults with no follow-up query) leaves the spinner stuck on.
812 results = []
490 results = []
813 columns = []
491 columns = []
814 columnOrder = []
492 columnOrder = []
815 hiddenColumns = []
493 hiddenColumns = []
816− savedHiddenColumns = []
817− savedColumnOrder = []
818 autoHiddenColumns = []
494 autoHiddenColumns = []
819 currentStream = nil
495 currentStream = nil
820 resultCount = 0
496 resultCount = 0
@@ -824,11 +500,6 @@ final class QueryViewModel {
824 errorRange = nil
500 errorRange = nil
825 resultsTruncated = false
501 resultsTruncated = false
826 schemaFields = []
502 schemaFields = []
827− // Keep the stream trackers consistent with the cleared schema/results so
828− // a later reload guard never sees a non-nil stream paired with empty data.
829− latestSchemaStream = nil
830− latestQueryStream = nil
834 /// Modifies `sqlQuery` to add a column-value filter condition.
505 /// Modifies `sqlQuery` to add a column-value filter condition.
@@ -838,139 +509,34 @@ final class QueryViewModel {
838 let condition: String
509 let condition: String
839 if let value, value != .null {
510 if let value, value != .null {
840 let literal = value.sqlLiteral
511 let literal = value.sqlLiteral
841− // Exclude with `IS DISTINCT FROM`, not `<>`: under SQL's three-valued
842− // logic `NULL <> 'x'` is NULL, so `<>` also dropped every row where the
843− // column is missing/NULL — common for sparse fields — which "exclude
844− // this value" doesn't ask for (the live-tail exclude keeps them too).
846− ? "\(escapedCol) IS DISTINCT FROM \(literal)"
847− : "\(escapedCol) = \(literal)"
512+ condition = exclude ? "\(escapedCol) <> \(literal)" : "\(escapedCol) = \(literal)"
849 condition = exclude ? "\(escapedCol) IS NOT NULL" : "\(escapedCol) IS NULL"
514 condition = exclude ? "\(escapedCol) IS NOT NULL" : "\(escapedCol) IS NULL"
852− let sql = sqlQuery.trimmingCharacters(in: .whitespacesAndNewlines)
517+ var sql = sqlQuery.trimmingCharacters(in: .whitespacesAndNewlines)
853 if sql.isEmpty { return }
518 if sql.isEmpty { return }
855− // Locate the top-level WHERE and the first trailing clause using the
520+ let wherePattern = #"(?i)\bWHERE\b"#
856− // tokenizer rather than a raw regex, so keywords inside quoted
521+ let tailPattern = #"(?i)\b(ORDER\s+BY|GROUP\s+BY|HAVING|LIMIT)\b"#
857− // identifiers, string literals, comments, or subqueries are ignored.
522+
858− let tokens = SQLTokenizer.tokenize(sql)
523+ if let whereRange = sql.range(of: wherePattern, options: .regularExpression) {
859− var depth = 0
524+ let afterWhere = whereRange.upperBound
860− // WHERE and the trailing clauses only follow the top-level FROM. Keywords
525+ let searchRange = afterWhere..<sql.endIndex
861− // before it belong to the SELECT list — e.g. a field named `offset` or
526+ if let tailRange = sql.range(of: tailPattern, options: .regularExpression, range: searchRange) {
862− // `limit` (which the tokenizer reports as keywords) — and must not be
527+ sql.insert(contentsOf: "AND \(condition) ", at: tailRange.lowerBound)
863− // mistaken for clause starts.
864− var fromSeen = false
865− var whereIndex: Int?
867− // Track whether the existing WHERE body has a top-level OR — only then does
868− // AND-ing a new condition need parentheses to preserve precedence.
869− var bodyHasTopLevelOr = false
870− // The last token that is actual SQL — not whitespace, a comment, or a
871− // statement-terminating `;`. New text is spliced in right after such
872− // tokens (never at the raw end of the string), so a trailing `;` or a
873− // trailing `-- comment` stays at the end instead of swallowing the
874− // appended condition: `... LIMIT 10;` must not become `... LIMIT 10; WHERE`,
875− // and `... -- note` must not become `... -- note WHERE <commented out>`.
876− func isSignificant(_ token: SQLTokenizer.Token) -> Bool {
877− !token.kind.isTrivia && token.kind != .other(";")
879− func nextSignificantKind(after index: Int) -> SQLTokenizer.TokenKind? {
880− tokens[(index + 1)...].first(where: { isSignificant($0) })?.kind
882− // Whether the keyword at `index` actually opens a trailing clause. ORDER and
883− // GROUP must be followed by BY (so `WITHIN GROUP (…)` or a column named
884− // `order` doesn't count), and LIMIT/OFFSET by their row count (so a column
885− // named `offset` in `WHERE offset > 5` doesn't cut the WHERE body short).
886− func startsTrailingClause(_ keyword: String, at index: Int) -> Bool {
888− case "ORDER", "GROUP":
889− return nextSignificantKind(after: index) == .keyword("BY")
890− case "LIMIT", "OFFSET":
891− if case .number = nextSignificantKind(after: index) { return true }
899− var lastSignificant: Int?
900− for (idx, token) in tokens.enumerated() {
901− if isSignificant(token) { lastSignificant = idx }
906− depth = max(0, depth - 1)
907− case .keyword("FROM") where depth == 0:
909− case .keyword(let kw) where depth == 0 && fromSeen:
910− if kw == "WHERE", whereIndex == nil {
912− // A trailing clause seen *before* the WHERE (e.g. the GROUP BY of
913− // the first SELECT in `... GROUP BY a UNION ALL SELECT ... WHERE`)
914− // doesn't end this WHERE's body. Keeping it would make the body
915− // range run backwards (a trapping `Range`), so look for the
916− // body's end afresh after the WHERE.
918− } else if tailIndex == nil, startsTrailingClause(kw, at: idx) {
920− } else if kw == "OR", whereIndex != nil, tailIndex == nil {
921− bodyHasTopLevelOr = true
927− // Nothing but comments/semicolons — there's no statement to filter.
928− guard let lastSignificant else { return }
930− // Each branch rebuilds the query from slices of the original text, keeping
931− // the user's line breaks: joining pieces with single spaces would pull the
932− // text after a `-- comment` onto the comment's line and comment it out.
933− // Text spliced directly in front of another token (`(a = 1)ORDER BY`) needs
934− // a space so the two don't fuse (`... IS NULLORDER BY`).
935− func separated(_ rest: Substring) -> String {
936− guard let next = rest.first, !next.isWhitespace, next != ";" else { return String(rest) }
940− // The WHERE body runs up to the first trailing clause, or to the end
941− // of the statement. Only its significant tokens bound the splice, so a
942− // comment between the body and ORDER BY stays after the new condition.
943− let bodyEndIndex = tailIndex ?? (lastSignificant + 1)
944− let bodyIndices = (whereIndex + 1)..<bodyEndIndex
945− if let first = bodyIndices.first(where: { isSignificant(tokens[$0]) }),
946− let last = bodyIndices.last(where: { isSignificant(tokens[$0]) }) {
947− // Parenthesize the existing WHERE body before AND-ing the new
948− // condition only when it has a top-level OR, otherwise the OR
949− // silently changes meaning: `WHERE a = 1 OR b = 2` would become
950− // `WHERE a = 1 OR b = 2 AND c = 3`, which SQL binds as
951− // `a = 1 OR (b = 2 AND c = 3)` rather than the intended
952− // `(a = 1 OR b = 2) AND c = 3`. A body without a top-level OR is
953− // left un-parenthesized so simple filters stay readable.
954− let bodyStart = tokens[first].range.lowerBound
955− let bodyEnd = tokens[last].range.upperBound
956− let body = sql[bodyStart..<bodyEnd]
957− let wrappedBody = bodyHasTopLevelOr ? "(\(body))" : String(body)
958− sqlQuery = "\(sql[..<bodyStart])\(wrappedBody) AND \(condition)\(separated(sql[bodyEnd...]))"
960− // An empty WHERE body (e.g. a half-written `... WHERE` with no
529+ sql += " AND \(condition)"
961− // condition yet, or `WHERE` immediately followed by ORDER/GROUP/
962− // LIMIT) would otherwise produce `WHERE AND <condition>` — a
963− // dangling AND with no left operand. Drop the AND in that case.
964− let whereEnd = tokens[whereIndex].range.upperBound
965− sqlQuery = "\(sql[..<whereEnd]) \(condition)\(separated(sql[whereEnd...]))"
967− } else if let tailIndex {
968− let tailStart = tokens[tailIndex].range.lowerBound
969− sqlQuery = "\(sql[..<tailStart])WHERE \(condition) \(sql[tailStart...])"
971− let statementEnd = tokens[lastSignificant].range.upperBound
532+ if let tailRange = sql.range(of: tailPattern, options: .regularExpression) {
972− sqlQuery = "\(sql[..<statementEnd]) WHERE \(condition)\(separated(sql[statementEnd...]))"
533+ sql.insert(contentsOf: "WHERE \(condition) ", at: tailRange.lowerBound)
535+ sql += " WHERE \(condition)"
976 /// Sets the default query for the given stream, returning `true` if the
542 /// Sets the default query for the given stream, returning `true` if the
@@ -994,35 +560,19 @@ final class QueryViewModel {
996 /// Escapes a SQL identifier by doubling internal double-quotes, then wrapping in double-quotes.
562 /// Escapes a SQL identifier by doubling internal double-quotes, then wrapping in double-quotes.
997− nonisolated static func escapeSQLIdentifier(_ identifier: String) -> String {
563+ static func escapeSQLIdentifier(_ identifier: String) -> String {
998 "\"\(identifier.replacingOccurrences(of: "\"", with: "\"\""))\""
564 "\"\(identifier.replacingOccurrences(of: "\"", with: "\"\""))\""
1001− /// Extracts the row cap from a trailing `LIMIT n` clause (tolerating a trailing
1002− /// semicolon/whitespace), used to detect when a result set was truncated.
1003− /// Returns nil when there's no recognizable trailing `LIMIT` — e.g. when the
1004− /// query uses `LIMIT n OFFSET m` — so we never report a false truncation.
1005− nonisolated static func trailingLimit(in sql: String) -> Int? {
1006− let pattern = #"(?i)\bLIMIT\s+(\d+)\s*;?\s*$"#
1007− guard let regex = try? NSRegularExpression(pattern: pattern) else { return nil }
1008− let range = NSRange(sql.startIndex..<sql.endIndex, in: sql)
1009− guard let match = regex.firstMatch(in: sql, range: range),
1010− let numberRange = Range(match.range(at: 1), in: sql) else { return nil }
1011− return Int(sql[numberRange])
1014 // MARK: - Query History
567 // MARK: - Query History
1016 private func addToHistory(_ entry: QueryHistoryEntry) {
569 private func addToHistory(_ entry: QueryHistoryEntry) {
1017− // Start from what's persisted, not this instance's copy: a model created
1018− // earlier (e.g. one whose query finished after a reconnect replaced it)
1019− // would otherwise overwrite newer entries saved by the current one.
1020− queryHistory = Self.loadHistory()
1021 // Deduplicate consecutive identical queries
570 // Deduplicate consecutive identical queries
1022 if queryHistory.first?.sql == entry.sql { return }
571 if queryHistory.first?.sql == entry.sql { return }
1023 queryHistory.insert(entry, at: 0)
572 queryHistory.insert(entry, at: 0)
1024 if queryHistory.count > Self.maxHistory {
573 if queryHistory.count > Self.maxHistory {
1025 queryHistory = Array(queryHistory.prefix(Self.maxHistory))
574 queryHistory = Array(queryHistory.prefix(Self.maxHistory))
575+ historyIsFull = true
1027 Self.saveHistory(queryHistory)
577 Self.saveHistory(queryHistory)