Skip to content

Fix force try in the FailableIterator.next() and Connection.prepare() methods #1273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix force try in the FailableIterator.next() and Connection.prepare() methods #1273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86eefea
Fix: Do not force try `FailableIterator.next()`
syoung-smallwisdom Jul 22, 2024
b1d6806
Fix: Use failableNext() in prepare so that if the try fails it will r…
syoung-smallwisdom Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Sources/SQLite/Core/Statement.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ public protocol FailableIterator: IteratorProtocol {

extension FailableIterator {
public func next() -> Element? {
// swiftlint:disable:next force_try
try! failableNext()
// Do not force try
try? failableNext()
}
}

Expand Down
5 changes: 2 additions & 3 deletions Sources/SQLite/Typed/Query.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,10 +1009,9 @@ extension Connection {
let statement = try prepare(expression.template, expression.bindings)

let columnNames = try columnNamesForQuery(query)
let rows = try statement.failableNext().map { Row(columnNames, $0) }

return AnySequence {
AnyIterator { statement.next().map { Row(columnNames, $0) } }
}
return AnySequence { AnyIterator { rows } }
}

public func prepareRowIterator(_ query: QueryType) throws -> RowIterator {
Expand Down