Swift 1.2 beta 2

Signed-off-by: Stephen Celis <[email protected]>

Author: stephencelis

SQLite Tests/StatementTests.swift

@@ -154,7 +154,7 @@ func withBlob(block: Blob -> ()) {
     let length = 1
     let buflen = Int(length) + 1
     let buffer = UnsafeMutablePointer<()>.alloc(buflen)
-    memcpy(buffer, "4", UInt(length))
+    memcpy(buffer, "4", length)
     block(Blob(bytes: buffer, length: length))
     buffer.dealloc(buflen)
 }

SQLite/Database.swift

@@ -27,7 +27,7 @@ import Foundation
 /// A connection (handle) to a SQLite database.
 public final class Database {
 
-    internal var handle = COpaquePointer.null()
+    internal var handle: COpaquePointer = nil
 
     /// Whether or not the database was opened in a read-only state.
     public var readonly: Bool { return sqlite3_db_readonly(handle, nil) == 1 }

SQLite/Functions.swift

@@ -173,6 +173,10 @@ public extension Database {
 
 }
 
-private func asValue<A: Value>(value: Binding?) -> A {
+private func asValue<A: Value>(value: Binding) -> A {
     return A.fromDatatypeValue(value as! A.Datatype) as! A
 }
+
+private func asValue<A: Value>(value: Binding?) -> A {
+    return asValue(value!)
+}

SQLite/Query.swift

@@ -768,7 +768,7 @@ public struct Row {
     }
     public func get<V: Value>(column: Expression<V?>) -> V? {
         func valueAtIndex(idx: Int) -> V? {
-            if let value = values[idx] as? V.Datatype { return (V.fromDatatypeValue(value) as! V) }
+            if let value = self.values[idx] as? V.Datatype { return (V.fromDatatypeValue(value) as! V) }
             return nil
         }
 
@@ -821,8 +821,7 @@ public struct QueryGenerator: GeneratorType {
     private lazy var columnNames: [String: Int] = {
         var (columnNames, idx) = ([String: Int](), 0)
         column: for each in self.query.columns ?? [Expression<()>(literal: "*")] {
-            // FIXME: rdar://19769314 // split(each.expression.SQL) { $0 == "." }
-            let pair = split(each.expression.SQL, { $0 == "." })
+            let pair = split(each.expression.SQL) { $0 == "." }
             let (tableName, column) = (pair.count > 1 ? pair.first : nil, pair.last!)
 
             func expandGlob(namespace: Bool) -> Query -> () {

SQLite/Statement.swift

@@ -28,7 +28,7 @@ internal let SQLITE_TRANSIENT = sqlite3_destructor_type(COpaquePointer(bitPatter
 /// A single SQL statement.
 public final class Statement {
 
-    private var handle = COpaquePointer.null()
+    private var handle: COpaquePointer = nil
 
     private let database: Database