Skip to content

Commit aec6564

Browse files
committed
Propagate error thrown in Query.pluck()
1 parent 403077f commit aec6564

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

SQLite/Typed/Query.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -954,11 +954,8 @@ extension Connection {
954954
return V.fromDatatypeValue(value)
955955
}
956956

957-
public func pluck(query: QueryType) -> Row? {
958-
guard let rows = try? prepare(query.limit(1, query.clauses.limit?.offset)) else {
959-
return nil
960-
}
961-
return rows.generate().next()
957+
public func pluck(query: QueryType) throws -> Row? {
958+
return try prepare(query.limit(1, query.clauses.limit?.offset)).generate().next()
962959
}
963960

964961
/// Runs an `Insert` query.

SQLiteTests/QueryTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ class QueryIntegrationTests : SQLiteTestCase {
315315

316316
func test_pluck() {
317317
let rowid = try! db.run(users.insert(email <- "alice@example.com"))
318-
XCTAssertEqual(rowid, db.pluck(users)![id])
318+
XCTAssertEqual(rowid, try! db.pluck(users)![id])
319319
}
320320

321321
func test_insert() {

0 commit comments

Comments
 (0)