@@ -2,7 +2,6 @@ import Foundation
22import SwiftUI
33
44@Observable
5−@MainActor
65final class QueryViewModel {
76 var sqlQuery = "" {
87 didSet {
@@ -17,8 +16,6 @@ final class QueryViewModel {
1716 // Build search texts asynchronously
1817 searchTextTask?.cancel()
1918 cachedSearchTexts = []
20− searchTextGeneration &+= 1
21− let generation = searchTextGeneration
2219 // Apply the current filter immediately using the inline fallback path
2320 // (the cache was just invalidated). Calling updateFilteredResults()
2421 // rather than `filteredResults = results` avoids briefly showing
@@ -27,61 +24,26 @@ final class QueryViewModel {
2724 // re-applies the filter.
2825 updateFilteredResults()
2926 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: " ")
38− }
39− }.value
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()
27+ searchTextTask = Task {
28+ let texts = snapshot.map { record in
29+ record.values.map { $0.displayString }.joined(separator: " ")
30+ }
31+ guard !Task.isCancelled else { return }
32+ cachedSearchTexts = texts
33+ if !filterText.isEmpty {
34+ updateFilteredResults()
5035 }
5136 }
5237 }
5338 }
5439 private var cachedSearchTexts: [String] = []
5540 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
5941 var columns: [String] = []
6042 var columnOrder: [String] = []
6143 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] = []
7244 var autoHiddenColumns: Set<String> = []
7345 /// Column config from a saved query, applied on next query execution.
7446 var pendingColumnConfig: ColumnConfiguration?
75−
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
79− /// tab was showing.
80− struct BoundContext: Equatable {
81− let connectionID: UUID?
82− let stream: String
83− }
84− var boundContext: BoundContext?
8547 private var currentStream: String?
8648 var isLoading = false
8749 var errorMessage: String?
@@ -99,23 +61,10 @@ final class QueryViewModel {
9961 var schemaFields: [SchemaField] = []
10062 /// The stream of the most recent `loadSchema` call, used to drop a stale
10163 /// 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?
64+ private var latestSchemaStream: String?
10865
10966 // Query task for cancellation
11067 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
11968
12069 // Time range
12170 var timeRangeOption: TimeRangeOption = .last1Hour
@@ -212,16 +161,9 @@ final class QueryViewModel {
212161 return columnOrder.filter { !allHidden.contains($0) }
213162 }
214163
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
219− }
220−
221164 func toggleColumnVisibility(_ column: String) {
222165 if hiddenColumns.contains(column) {
223166 hiddenColumns.remove(column)
224− savedHiddenColumns.remove(column)
225167 } else if autoHiddenColumns.contains(column) {
226168 autoHiddenColumns.remove(column)
227169 } else {
@@ -230,7 +172,6 @@ final class QueryViewModel {
230172 let visibleCount = columnOrder.count - allHidden.count
231173 if visibleCount > 1 {
232174 hiddenColumns.insert(column)
233− savedHiddenColumns.insert(column)
234175 }
235176 }
236177 saveColumnConfig()
@@ -239,7 +180,6 @@ final class QueryViewModel {
239180
240181 func showAllColumns() {
241182 hiddenColumns.removeAll()
242− savedHiddenColumns.removeAll()
243183 autoHiddenColumns.removeAll()
244184 saveColumnConfig()
245185 updateSQLColumns()
@@ -269,116 +209,32 @@ final class QueryViewModel {
269209
270210 func resetColumnConfig() {
271211 columnOrder = columns
272− savedColumnOrder = []
273212 hiddenColumns.removeAll()
274− savedHiddenColumns.removeAll()
275213 autoHiddenColumns.removeAll()
276214 saveColumnConfig()
277215 updateSQLColumns()
278216 }
279217
280− /// Rewrites the SELECT clause of `sqlQuery` to reflect the user's column
281− /// choices (order and hidden columns; auto-hidden columns stay display-only).
218+ /// Rewrites the SELECT clause of `sqlQuery` to reflect the current `visibleColumns`.
282219 func updateSQLColumns() {
283− guard let range = SQLTokenizer.selectColumnListRange(in: sqlQuery),
284− let currentList = Self.parseColumnList(sqlQuery[range]) else { return }
285−
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 }
220+ guard let range = SQLTokenizer.selectColumnListRange(in: sqlQuery) else { return }
292221
293− // Columns an explicit list names that aren't in the results: Parseable
294− // omits all-null fields from query JSON, so a sparse listed field can be
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)
305− }
222+ let visible = visibleColumns
223+ guard !visible.isEmpty else { return }
306224
307225 let newColumnList: String
308226 // Use `*` whenever every column is visible, regardless of display order —
309227 // 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) {
228+ // to an explicit snapshot that hides newly-appearing fields on re-query.
229+ if visible.count == columns.count && Set(visible) == Set(columns) {
314230 newColumnList = "*"
315231 } else {
316− newColumnList = (visible + listedButAbsent).map { Self.escapeSQLIdentifier($0) }.joined(separator: ", ")
232+ newColumnList = visible.map { Self.escapeSQLIdentifier($0) }.joined(separator: ", ")
317233 }
318234
319235 sqlQuery.replaceSubrange(range, with: newColumnList)
320236 }
321237
322− enum ColumnListShape: Equatable {
323− case star
324− /// Plain column references, as the column names they resolve to.
325− case identifiers([String])
326− }
327−
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() {
340− if index % 2 == 1 {
341− guard token.kind == .comma else { return nil }
342− continue
343− }
344− switch token.kind {
345− // DataFusion folds unquoted identifiers to lowercase.
346− case .identifier(let name): names.append(name.lowercased())
347− case .quotedIdentifier(let name): names.append(name)
348− default: return nil
349− }
350− }
351− return .identifiers(names)
352− }
353−
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]
360− ) -> [String] {
361− var result = order
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)
372− } else {
373− result.insert(column, at: 0)
374− }
375− }
376− for column in pending where !result.contains(column) {
377− result.append(column)
378− }
379− return result
380− }
381−
382238 // MARK: - Column Configuration Persistence
383239
384240 struct ColumnConfiguration: Codable {
@@ -392,16 +248,7 @@ final class QueryViewModel {
392248
393249 private func saveColumnConfig() {
394250 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(
399− columnOrder,
400− inserting: savedColumnOrder.filter { !present.contains($0) },
401− reference: savedColumnOrder
402− )
403− savedColumnOrder = order
404− let config = ColumnConfiguration(order: order, hidden: savedHiddenColumns.union(hiddenColumns))
251+ let config = ColumnConfiguration(order: columnOrder, hidden: hiddenColumns)
405252 if let data = try? JSONEncoder().encode(config) {
406253 UserDefaults.standard.set(data, forKey: Self.columnConfigKey(for: stream))
407254 }
@@ -430,9 +277,7 @@ final class QueryViewModel {
430277
431278 guard let config else {
432279 columnOrder = extractedColumns
433− savedColumnOrder = []
434280 hiddenColumns = []
435− savedHiddenColumns = []
436281 return
437282 }
438283
@@ -445,8 +290,6 @@ final class QueryViewModel {
445290 merged.append(col)
446291 }
447292 columnOrder = merged
448− savedColumnOrder = config.order
449− savedHiddenColumns = config.hidden
450293 hiddenColumns = config.hidden.intersection(extractedSet)
451294
452295 // The `visibleCount > 1` guard in toggleColumnVisibility only covers
@@ -540,13 +383,6 @@ final class QueryViewModel {
540383
541384 // Cancel any in-flight query
542385 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
550386
551387 isLoading = true
552388 errorMessage = nil
@@ -555,16 +391,6 @@ final class QueryViewModel {
555391 let startTime = CFAbsoluteTimeGetCurrent()
556392
557393 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.
563− defer {
564− if generation == queryGeneration {
565− isLoading = false
566− }
567− }
568394 do {
569395 try Task.checkCancellation()
570396 let queryResults = try await client.query(sql: sql, startTime: startDate, endTime: endDate)
@@ -574,25 +400,14 @@ final class QueryViewModel {
574400 // cancellation landing just after the check above would otherwise
575401 // let a stale query clobber the newer one's results/columns.
576402 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 }
580403
581404 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
586405 queryDuration = CFAbsoluteTimeGetCurrent() - startTime
587406 resultCount = results.count
588407
589− // Detect if results were likely truncated. We know the cap for
590− // auto-generated queries; for user-entered SQL (which includes the
591− // default query `setDefaultQuery` writes into the editor — the common
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
408+ // Detect if results were likely truncated (only meaningful
409+ // for auto-generated queries where we control the LIMIT)
410+ resultsTruncated = usedAutoLimit && results.count == limit
596411
597412 // Extract columns in a single pass, with priority fields first,
598413 // then apply any saved column configuration for this stream
@@ -619,23 +434,12 @@ final class QueryViewModel {
619434 return
620435 } catch {
621436 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 }
625437 errorMessage = ParseableError.userFriendlyMessage(for: error)
626438 if let serverError = error as? ParseableError,
627439 case .serverError(_, let msg) = serverError,
628− let pos = SQLErrorPosition.parse(from: msg),
629− sqlQuery == sql {
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.)
440+ let pos = SQLErrorPosition.parse(from: msg) {
637441 errorRange = SQLTokenizer.errorHighlightRange(
638− line: pos.line, column: pos.column, in: sql
442+ line: pos.line, column: pos.column, in: sqlQuery
639443 )
640444 }
641445 results = []
@@ -645,10 +449,10 @@ final class QueryViewModel {
645449 // report stale column names after the failure.
646450 columnOrder = []
647451 hiddenColumns = []
648− savedHiddenColumns = []
649− savedColumnOrder = []
650452 autoHiddenColumns = []
651453 }
454+
455+ isLoading = false
652456 }
653457 queryTask = task
654458 await task.value
@@ -719,31 +523,25 @@ final class QueryViewModel {
719523 return empty
720524 }
721525
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.
725526 func exportAsJSON() -> String {
726− let rows = filteredResults
727− guard !rows.isEmpty else { return "[]" }
527+ guard !results.isEmpty else { return "[]" }
728528 let encoder = JSONEncoder()
729529 encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
730− if let data = try? encoder.encode(Self.projectRecords(rows, to: visibleColumns)),
530+ if let data = try? encoder.encode(Self.projectRecords(results, to: visibleColumns)),
731531 let string = String(data: data, encoding: .utf8) {
732532 return string
733533 }
734534 return "[]"
735535 }
736536
737− /// Exports the on-screen rows as CSV. Uses `filteredResults` for the same
738− /// reason as `exportAsJSON`.
739537 func exportAsCSV() -> String {
740− Self.buildCSV(records: filteredResults, columns: visibleColumns)
538+ Self.buildCSV(records: results, columns: visibleColumns)
741539 }
742540
743541 /// Projects each record down to the given columns so JSON export, like CSV,
744542 /// respects hidden columns instead of leaking every field. Safe to call from
745543 /// any thread.
746− nonisolated static func projectRecords(_ records: [LogRecord], to columns: [String]) -> [LogRecord] {
544+ static func projectRecords(_ records: [LogRecord], to columns: [String]) -> [LogRecord] {
747545 // No column list means no restriction (columns not computed yet) — export
748546 // the full records rather than stripping every field to an empty object.
749547 guard !columns.isEmpty else { return records }
@@ -752,7 +550,7 @@ final class QueryViewModel {
752550 }
753551
754552 /// Builds a CSV string from records and columns. Safe to call from any thread.
755− nonisolated static func buildCSV(records: [LogRecord], columns: [String]) -> String {
553+ static func buildCSV(records: [LogRecord], columns: [String]) -> String {
756554 guard !records.isEmpty, !columns.isEmpty else { return "" }
757555
758556 var csv = String()
@@ -778,7 +576,7 @@ final class QueryViewModel {
778576 return csv
779577 }
780578
781− nonisolated private static func escapeCSV(_ value: String) -> String {
579+ private static func escapeCSV(_ value: String) -> String {
782580 // Check at the Unicode scalar level to correctly detect \r and \n
783581 // inside \r\n (CRLF) grapheme clusters, which Swift's String.contains
784582 // treats as a single Character that doesn't match "\r" or "\n" alone.
@@ -813,8 +611,6 @@ final class QueryViewModel {
813611 columns = []
814612 columnOrder = []
815613 hiddenColumns = []
816− savedHiddenColumns = []
817− savedColumnOrder = []
818614 autoHiddenColumns = []
819615 currentStream = nil
820616 resultCount = 0
@@ -824,11 +620,6 @@ final class QueryViewModel {
824620 errorRange = nil
825621 resultsTruncated = false
826622 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
831− boundContext = nil
832623 }
833624
834625 /// Modifies `sqlQuery` to add a column-value filter condition.
@@ -838,139 +629,75 @@ final class QueryViewModel {
838629 let condition: String
839630 if let value, value != .null {
840631 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).
845− condition = exclude
846− ? "\(escapedCol) IS DISTINCT FROM \(literal)"
847− : "\(escapedCol) = \(literal)"
632+ condition = exclude ? "\(escapedCol) <> \(literal)" : "\(escapedCol) = \(literal)"
848633 } else {
849634 condition = exclude ? "\(escapedCol) IS NOT NULL" : "\(escapedCol) IS NULL"
850635 }
851636
852− let sql = sqlQuery.trimmingCharacters(in: .whitespacesAndNewlines)
637+ var sql = sqlQuery.trimmingCharacters(in: .whitespacesAndNewlines)
853638 if sql.isEmpty { return }
854639
855640 // Locate the top-level WHERE and the first trailing clause using the
856641 // tokenizer rather than a raw regex, so keywords inside quoted
857642 // identifiers, string literals, comments, or subqueries are ignored.
858− let tokens = SQLTokenizer.tokenize(sql)
643+ let tailKeywords: Set<String> = ["ORDER", "GROUP", "HAVING", "LIMIT", "OFFSET"]
859644 var depth = 0
860− // WHERE and the trailing clauses only follow the top-level FROM. Keywords
861− // before it belong to the SELECT list — e.g. a field named `offset` or
862− // `limit` (which the tokenizer reports as keywords) — and must not be
863− // mistaken for clause starts.
864− var fromSeen = false
865− var whereIndex: Int?
866− var tailIndex: Int?
645+ var whereEnd: String.Index?
646+ var tailStart: String.Index?
867647 // Track whether the existing WHERE body has a top-level OR — only then does
868648 // AND-ing a new condition need parentheses to preserve precedence.
869649 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(";")
878− }
879− func nextSignificantKind(after index: Int) -> SQLTokenizer.TokenKind? {
880− tokens[(index + 1)...].first(where: { isSignificant($0) })?.kind
881− }
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 {
887− switch keyword {
888− case "ORDER", "GROUP":
889− return nextSignificantKind(after: index) == .keyword("BY")
890− case "LIMIT", "OFFSET":
891− if case .number = nextSignificantKind(after: index) { return true }
892− return false
893− case "HAVING":
894− return true
895− default:
896− return false
897− }
898− }
899− var lastSignificant: Int?
900− for (idx, token) in tokens.enumerated() {
901− if isSignificant(token) { lastSignificant = idx }
650+ for token in SQLTokenizer.tokenize(sql) {
902651 switch token.kind {
903652 case .leftParen:
904653 depth += 1
905654 case .rightParen:
906655 depth = max(0, depth - 1)
907− case .keyword("FROM") where depth == 0:
908− fromSeen = true
909− case .keyword(let kw) where depth == 0 && fromSeen:
910− if kw == "WHERE", whereIndex == nil {
911− whereIndex = idx
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.
917− tailIndex = nil
918− } else if tailIndex == nil, startsTrailingClause(kw, at: idx) {
919− tailIndex = idx
920− } else if kw == "OR", whereIndex != nil, tailIndex == nil {
656+ case .keyword(let kw) where depth == 0:
657+ if kw == "WHERE", whereEnd == nil {
658+ whereEnd = token.range.upperBound
659+ } else if tailKeywords.contains(kw), tailStart == nil {
660+ tailStart = token.range.lowerBound
661+ } else if kw == "OR", whereEnd != nil, tailStart == nil {
921662 bodyHasTopLevelOr = true
922663 }
923664 default:
924665 break
925666 }
926667 }
927− // Nothing but comments/semicolons — there's no statement to filter.
928− guard let lastSignificant else { return }
929−
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) }
937− return " " + rest
938− }
939− if let whereIndex {
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...]))"
668+
669+ if let whereEnd {
670+ // Parenthesize the existing WHERE body before AND-ing the new
671+ // condition only when it has a top-level OR, otherwise the OR
672+ // silently changes meaning: `WHERE a = 1 OR b = 2` would become
673+ // `WHERE a = 1 OR b = 2 AND c = 3`, which SQL binds as
674+ // `a = 1 OR (b = 2 AND c = 3)` rather than the intended
675+ // `(a = 1 OR b = 2) AND c = 3`. A body without a top-level OR is
676+ // left un-parenthesized so simple filters stay readable.
677+ let bodyEnd = tailStart ?? sql.endIndex
678+ let head = sql[..<whereEnd]
679+ let body = sql[whereEnd..<bodyEnd].trimmingCharacters(in: .whitespacesAndNewlines)
680+ let tail = sql[bodyEnd...].trimmingCharacters(in: .whitespacesAndNewlines)
681+ // An empty WHERE body (e.g. a half-written `... WHERE` with no
682+ // condition yet, or `WHERE` immediately followed by ORDER/GROUP/
683+ // LIMIT) would otherwise produce `WHERE AND <condition>` — a
684+ // dangling AND with no left operand. Drop the AND in that case.
685+ if body.isEmpty {
686+ sql = "\(head) \(condition)"
959687 } else {
960− // An empty WHERE body (e.g. a half-written `... WHERE` with no
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...]))"
688+ let wrappedBody = bodyHasTopLevelOr ? "(\(body))" : body
689+ sql = "\(head) \(wrappedBody) AND \(condition)"
690+ }
691+ if !tail.isEmpty {
692+ sql += " \(tail)"
966693 }
967− } else if let tailIndex {
968− let tailStart = tokens[tailIndex].range.lowerBound
969− sqlQuery = "\(sql[..<tailStart])WHERE \(condition) \(sql[tailStart...])"
694+ } else if let tailStart {
695+ sql.insert(contentsOf: "WHERE \(condition) ", at: tailStart)
970696 } else {
971− let statementEnd = tokens[lastSignificant].range.upperBound
972− sqlQuery = "\(sql[..<statementEnd]) WHERE \(condition)\(separated(sql[statementEnd...]))"
697+ sql += " WHERE \(condition)"
973698 }
699+
700+ sqlQuery = sql
974701 }
975702
976703 /// Sets the default query for the given stream, returning `true` if the
@@ -994,30 +721,13 @@ final class QueryViewModel {
994721 }
995722
996723 /// Escapes a SQL identifier by doubling internal double-quotes, then wrapping in double-quotes.
997− nonisolated static func escapeSQLIdentifier(_ identifier: String) -> String {
724+ static func escapeSQLIdentifier(_ identifier: String) -> String {
998725 "\"\(identifier.replacingOccurrences(of: "\"", with: "\"\""))\""
999726 }
1000727
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])
1012− }
1013−
1014728 // MARK: - Query History
1015729
1016730 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()
1021731 // Deduplicate consecutive identical queries
1022732 if queryHistory.first?.sql == entry.sql { return }
1023733 queryHistory.insert(entry, at: 0)