git.iko.soy/parseable-macos
on master help sign in
Fix 2 bugs: phantom retention policy, dangling autocomplete quote
895b357iko
ParseableViewer/Services/ParseableClient.swift+6
compare with master
unifiedsplit
@@ -394,6 +394,12 @@ final class ParseableClient: Sendable {
394 }
394 }
395 do {
395 do {
396 let single = try Self.jsonDecoder.decode(RetentionConfig.self, from: data)
396 let single = try Self.jsonDecoder.decode(RetentionConfig.self, from: data)
397+ // RetentionConfig decodes every field with `try?`, so any JSON object
398+ // (including `{}` or an error body) decodes to an all-nil config. Treat
399+ // an empty config as "no retention" rather than a phantom policy entry.
400+ guard single.description != nil || single.duration != nil || single.action != nil else {
401+ return []
402+ }
397 return [single]
403 return [single]
398 } catch {
404 } catch {
399 throw ParseableError.decodingError("Unexpected retention response format")
405 throw ParseableError.decodingError("Unexpected retention response format")
ParseableViewer/Views/SQLEditorView.swift+9−9
@@ -223,15 +223,15 @@ struct SQLEditorView: NSViewRepresentable {
223 }
223 }
224 }
224 }
225
225
226− // A table completion carries its own quotes; absorb a directly
226+ // A table completion carries its own quotes; absorb any double-quote the
227− // preceding opening quote the user typed (e.g. `FROM "my`) so the
228− // inserted `"name"` replaces it instead of producing `""name"`.
227+ // user typed directly around the word so the inserted `"name"` replaces
228+ // it instead of leaving a stray quote. Leading and trailing are handled
229+ // independently: a closing quote can exist without an opening one (e.g.
230+ // `FROM my"`), which would otherwise produce a dangling `"name""`.
229− if item.kind == .table, wordStart > 0,
231+ if item.kind == .table {
230− nsText.character(at: wordStart - 1) == 0x22 {
232+ if wordStart > 0, nsText.character(at: wordStart - 1) == 0x22 {
231− wordStart -= 1
233+ wordStart -= 1
232− // Mirror on the trailing side: if a matching closing quote follows
234+ }
233− // the word (caret inside an already-quoted `FROM "my|"`), absorb it
234− // too so the inserted `"name"` doesn't leave a dangling `"name""`.
235 if wordEnd < nsText.length, nsText.character(at: wordEnd) == 0x22 {
235 if wordEnd < nsText.length, nsText.character(at: wordEnd) == 0x22 {
236 wordEnd += 1
236 wordEnd += 1
237 }
237 }