Merge pull request stephencelis#290 from kujenga/swift-2

propagate errors in Statement initialization

Author: stephencelis

README.md

@@ -56,15 +56,15 @@ let insert = users.insert(name <- "Alice", email <- "alice@mac.com")
 let rowid = try db.run(insert)
 // INSERT INTO "users" ("name", "email") VALUES ('Alice', 'alice@mac.com')
 
-for user in db.prepare(users) {
-    println("id: \(user[id]), name: \(user[name]), email: \(user[email])")
+for user in try db.prepare(users) {
+    print("id: \(user[id]), name: \(user[name]), email: \(user[email])")
     // id: 1, name: Optional("Alice"), email: alice@mac.com
 }
 // SELECT * FROM "users"
 
 let alice = users.filter(id == rowid)
 
-try db.run(alice.update(email <- email.replace("mac.com", "me.com")))
+try db.run(alice.update(email <- email.replace("mac.com", with: "me.com")))
 // UPDATE "users" SET "email" = replace("email", 'mac.com', 'me.com')
 // WHERE ("id" = 1)
 
@@ -79,17 +79,17 @@ SQLite.swift also works as a lightweight, Swift-friendly wrapper over the C
 API.
 
 ``` swift
-let stmt = db.prepare("INSERT INTO users (email) VALUES (?)")
+let stmt = try db.prepare("INSERT INTO users (email) VALUES (?)")
 for email in ["betty@icloud.com", "cathy@icloud.com"] {
-    stmt.run(email)
+    try stmt.run(email)
 }
 
 db.totalChanges    // 3
 db.changes         // 1
 db.lastInsertRowid // 3
 
-for row in db.prepare("SELECT id, email FROM users") {
-    println("id: \(row[0]), email: \(row[1])")
+for row in try db.prepare("SELECT id, email FROM users") {
+    print("id: \(row[0]), email: \(row[1])")
     // id: Optional(2), email: Optional("betty@icloud.com")
     // id: Optional(3), email: Optional("cathy@icloud.com")
 }

SQLite.playground/Contents.swift

@@ -19,7 +19,7 @@ try! db.run(users.create { t in
 let rowid = try! db.run(users.insert(email <- "alice@mac.com"))
 let alice = users.filter(id == rowid)
 
-for user in db.prepare(users) {
+for user in try! db.prepare(users) {
     print("id: \(user[id]), email: \(user[email])")
 }
 
@@ -37,7 +37,7 @@ try! db.run(emails.insert(
 
 let row = db.pluck(emails.match("hello"))
 
-let query = db.prepare(emails.match("hello"))
+let query = try! db.prepare(emails.match("hello"))
 for row in query {
     print(row[subject])
 }

Source/Core/Connection.swift

@@ -140,9 +140,9 @@ public final class Connection {
     ///   - bindings: A list of parameters to bind to the statement.
     ///
     /// - Returns: A prepared statement.
-    @warn_unused_result public func prepare(statement: String, _ bindings: Binding?...) -> Statement {
-        if !bindings.isEmpty { return prepare(statement, bindings) }
-        return Statement(self, statement)
+    @warn_unused_result public func prepare(statement: String, _ bindings: Binding?...) throws -> Statement {
+        if !bindings.isEmpty { return try prepare(statement, bindings) }
+        return try Statement(self, statement)
     }
 
     /// Prepares a single SQL statement and binds parameters to it.
@@ -154,8 +154,8 @@ public final class Connection {
     ///   - bindings: A list of parameters to bind to the statement.
     ///
     /// - Returns: A prepared statement.
-    @warn_unused_result public func prepare(statement: String, _ bindings: [Binding?]) -> Statement {
-        return prepare(statement).bind(bindings)
+    @warn_unused_result public func prepare(statement: String, _ bindings: [Binding?]) throws -> Statement {
+        return try prepare(statement).bind(bindings)
     }
 
     /// Prepares a single SQL statement and binds parameters to it.
@@ -167,8 +167,8 @@ public final class Connection {
     ///   - bindings: A dictionary of named parameters to bind to the statement.
     ///
     /// - Returns: A prepared statement.
-    @warn_unused_result public func prepare(statement: String, _ bindings: [String: Binding?]) -> Statement {
-        return prepare(statement).bind(bindings)
+    @warn_unused_result public func prepare(statement: String, _ bindings: [String: Binding?]) throws -> Statement {
+        return try prepare(statement).bind(bindings)
     }
 
     // MARK: - Run
@@ -245,7 +245,7 @@ public final class Connection {
     ///
     /// - Returns: The first value of the first row returned.
     @warn_unused_result public func scalar(statement: String, _ bindings: [Binding?]) -> Binding? {
-        return prepare(statement).scalar(bindings)
+        return try! prepare(statement).scalar(bindings)
     }
 
     /// Runs a single SQL statement (with optional parameter bindings),
@@ -259,7 +259,7 @@ public final class Connection {
     ///
     /// - Returns: The first value of the first row returned.
     @warn_unused_result public func scalar(statement: String, _ bindings: [String: Binding?]) -> Binding? {
-        return prepare(statement).scalar(bindings)
+        return try! prepare(statement).scalar(bindings)
     }
 
     // MARK: - Transactions

Source/Core/Statement.swift

@@ -29,9 +29,9 @@ public final class Statement {
 
     private let connection: Connection
 
-    init(_ connection: Connection, _ SQL: String) {
+    init(_ connection: Connection, _ SQL: String) throws {
         self.connection = connection
-        try! connection.check(sqlite3_prepare_v2(connection.handle, SQL, -1, &handle, nil))
+        try connection.check(sqlite3_prepare_v2(connection.handle, SQL, -1, &handle, nil))
     }
 
     deinit {

Source/Typed/Query.swift

@@ -857,23 +857,23 @@ public struct Delete : ExpressionType {
 
 extension Connection {
 
-    public func prepare(query: QueryType) -> AnySequence<Row> {
+    public func prepare(query: QueryType) throws -> AnySequence<Row> {
         let expression = query.expression
-        let statement = prepare(expression.template, expression.bindings)
+        let statement = try prepare(expression.template, expression.bindings)
 
-        let columnNames: [String: Int] = {
+        let columnNames: [String: Int] = try {
             var (columnNames, idx) = ([String: Int](), 0)
             column: for each in query.clauses.select.columns ?? [Expression<Void>(literal: "*")] {
                 var names = each.expression.template.characters.split { $0 == "." }.map(String.init)
                 let column = names.removeLast()
                 let namespace = names.joinWithSeparator(".")
 
-                func expandGlob(namespace: Bool) -> QueryType -> Void {
-                    return { query in
+                func expandGlob(namespace: Bool) -> (QueryType throws -> Void) {
+                    return { (query: QueryType) throws -> (Void) in
                         var q = query.dynamicType.init(query.clauses.from.name, database: query.clauses.from.database)
                         q.clauses.select = query.clauses.select
                         let e = q.expression
-                        var names = self.prepare(e.template, e.bindings).columnNames.map { $0.quote() }
+                        var names = try self.prepare(e.template, e.bindings).columnNames.map { $0.quote() }
                         if namespace { names = names.map { "\(query.tableName().expression.template).\($0)" } }
                         for name in names { columnNames[name] = idx++ }
                     }
@@ -886,14 +886,14 @@ extension Connection {
                     if !namespace.isEmpty {
                         for q in queries {
                             if q.tableName().expression.template == namespace {
-                                expandGlob(true)(q)
+                                try expandGlob(true)(q)
                                 continue column
                             }
                         }
                         fatalError("no such table: \(namespace)")
                     }
                     for q in queries {
-                        expandGlob(query.clauses.join.count > 0)(q)
+                        try expandGlob(query.clauses.join.count > 0)(q)
                     }
                     continue
                 }
@@ -931,7 +931,7 @@ extension Connection {
     }
 
     public func pluck(query: QueryType) -> Row? {
-        return prepare(query.limit(1, query.clauses.limit?.offset)).generate().next()
+        return try! prepare(query.limit(1, query.clauses.limit?.offset)).generate().next()
     }
 
     /// Runs an `Insert` query.

Tests/ConnectionTests.swift

@@ -72,10 +72,10 @@ class ConnectionTests : SQLiteTestCase {
     }
 
     func test_prepare_preparesAndReturnsStatements() {
-        _ = db.prepare("SELECT * FROM users WHERE admin = 0")
-        _ = db.prepare("SELECT * FROM users WHERE admin = ?", 0)
-        _ = db.prepare("SELECT * FROM users WHERE admin = ?", [0])
-        _ = db.prepare("SELECT * FROM users WHERE admin = $admin", ["$admin": 0])
+        _ = try! db.prepare("SELECT * FROM users WHERE admin = 0")
+        _ = try! db.prepare("SELECT * FROM users WHERE admin = ?", 0)
+        _ = try! db.prepare("SELECT * FROM users WHERE admin = ?", [0])
+        _ = try! db.prepare("SELECT * FROM users WHERE admin = $admin", ["$admin": 0])
     }
 
     func test_run_preparesRunsAndReturnsStatements() {
@@ -113,7 +113,7 @@ class ConnectionTests : SQLiteTestCase {
     }
 
     func test_transaction_beginsAndCommitsTransactions() {
-        let stmt = db.prepare("INSERT INTO users (email) VALUES (?)", "alice@example.com")
+        let stmt = try! db.prepare("INSERT INTO users (email) VALUES (?)", "alice@example.com")
 
         try! db.transaction {
             try stmt.run()
@@ -126,7 +126,7 @@ class ConnectionTests : SQLiteTestCase {
     }
 
     func test_transaction_beginsAndRollsTransactionsBack() {
-        let stmt = db.prepare("INSERT INTO users (email) VALUES (?)", "alice@example.com")
+        let stmt = try! db.prepare("INSERT INTO users (email) VALUES (?)", "alice@example.com")
 
         do {
             try db.transaction {
@@ -162,7 +162,7 @@ class ConnectionTests : SQLiteTestCase {
 
     func test_savepoint_beginsAndRollsSavepointsBack() {
         let db = self.db
-        let stmt = db.prepare("INSERT INTO users (email) VALUES (?)", "alice@example.com")
+        let stmt = try! db.prepare("INSERT INTO users (email) VALUES (?)", "alice@example.com")
 
         do {
             try db.savepoint("1") {
@@ -307,7 +307,7 @@ class ConnectionTests : SQLiteTestCase {
             return nil
         }
 
-        let stmt = db.prepare("SELECT *, sleep(?) FROM users", 0.1)
+        let stmt = try! db.prepare("SELECT *, sleep(?) FROM users", 0.1)
         try! stmt.run()
 
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(10 * NSEC_PER_MSEC)), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), db.interrupt)

Tests/QueryTests.swift

@@ -278,7 +278,7 @@ class QueryIntegrationTests : SQLiteTestCase {
     // MARK: -
 
     func test_select() {
-        for _ in db.prepare(users) {
+        for _ in try! db.prepare(users) {
             // FIXME
         }
 
@@ -288,7 +288,7 @@ class QueryIntegrationTests : SQLiteTestCase {
         let alice = try! db.run(users.insert(email <- "alice@example.com"))
         try! db.run(users.insert(email <- "betsy@example.com", managerId <- alice))
 
-        for user in db.prepare(users.join(managers, on: managers[id] == users[managerId])) {
+        for user in try! db.prepare(users.join(managers, on: managers[id] == users[managerId])) {
             user[users[managerId]]
         }
     }