Generics work as expected now

Author: jberkel

Sources/SQLite/Foundation.swift

@@ -68,41 +68,3 @@ public var dateFormatter: DateFormatter = {
     formatter.timeZone = TimeZone(secondsFromGMT: 0)
     return formatter
 }()
-
-// FIXME: rdar://problem/18673897 // subscript<T>…
-
-extension QueryType {
-
-    public subscript(column: Expression<Data>) -> Expression<Data> {
-        return namespace(column)
-    }
-    public subscript(column: Expression<Data?>) -> Expression<Data?> {
-        return namespace(column)
-    }
-
-    public subscript(column: Expression<Date>) -> Expression<Date> {
-        return namespace(column)
-    }
-    public subscript(column: Expression<Date?>) -> Expression<Date?> {
-        return namespace(column)
-    }
-
-}
-
-extension Row {
-
-    public subscript(column: Expression<Data>) -> Data {
-        return get(column)
-    }
-    public subscript(column: Expression<Data?>) -> Data? {
-        return get(column)
-    }
-
-    public subscript(column: Expression<Date>) -> Date {
-        return get(column)
-    }
-    public subscript(column: Expression<Date?>) -> Date? {
-        return get(column)
-    }
-
-}

Sources/SQLite/Typed/Query.swift

@@ -726,47 +726,11 @@ extension QueryType {
         return Expression(".".join([tableName(), column]).expression)
     }
 
-    // FIXME: rdar://problem/18673897 // subscript<T>…
-
-    public subscript(column: Expression<Blob>) -> Expression<Blob> {
-        return namespace(column)
-    }
-    public subscript(column: Expression<Blob?>) -> Expression<Blob?> {
-        return namespace(column)
-    }
-
-    public subscript(column: Expression<Bool>) -> Expression<Bool> {
-        return namespace(column)
-    }
-    public subscript(column: Expression<Bool?>) -> Expression<Bool?> {
-        return namespace(column)
-    }
-
-    public subscript(column: Expression<Double>) -> Expression<Double> {
-        return namespace(column)
-    }
-    public subscript(column: Expression<Double?>) -> Expression<Double?> {
+    public subscript<T>(column: Expression<T>) -> Expression<T> {
         return namespace(column)
     }
 
-    public subscript(column: Expression<Int>) -> Expression<Int> {
-        return namespace(column)
-    }
-    public subscript(column: Expression<Int?>) -> Expression<Int?> {
-        return namespace(column)
-    }
-
-    public subscript(column: Expression<Int64>) -> Expression<Int64> {
-        return namespace(column)
-    }
-    public subscript(column: Expression<Int64?>) -> Expression<Int64?> {
-        return namespace(column)
-    }
-
-    public subscript(column: Expression<String>) -> Expression<String> {
-        return namespace(column)
-    }
-    public subscript(column: Expression<String?>) -> Expression<String?> {
+    public subscript<T>(column: Expression<T?>) -> Expression<T?> {
         return namespace(column)
     }
 
@@ -1102,50 +1066,13 @@ public struct Row {
         return valueAtIndex(idx)
     }
 
-    // FIXME: rdar://problem/18673897 // subscript<T>…
-
-    public subscript(column: Expression<Blob>) -> Blob {
-        return get(column)
-    }
-    public subscript(column: Expression<Blob?>) -> Blob? {
-        return get(column)
-    }
-
-    public subscript(column: Expression<Bool>) -> Bool {
-        return get(column)
-    }
-    public subscript(column: Expression<Bool?>) -> Bool? {
+    public subscript<T : Value>(column: Expression<T>) -> T {
         return get(column)
     }
 
-    public subscript(column: Expression<Double>) -> Double {
+    public subscript<T : Value>(column: Expression<T?>) -> T? {
         return get(column)
     }
-    public subscript(column: Expression<Double?>) -> Double? {
-        return get(column)
-    }
-
-    public subscript(column: Expression<Int>) -> Int {
-        return get(column)
-    }
-    public subscript(column: Expression<Int?>) -> Int? {
-        return get(column)
-    }
-
-    public subscript(column: Expression<Int64>) -> Int64 {
-        return get(column)
-    }
-    public subscript(column: Expression<Int64?>) -> Int64? {
-        return get(column)
-    }
-
-    public subscript(column: Expression<String>) -> String {
-        return get(column)
-    }
-    public subscript(column: Expression<String?>) -> String? {
-        return get(column)
-    }
-
 }
 
 /// Determines the join operator for a query’s `JOIN` clause.

Tests/SQLiteTests/QueryTests.swift

@@ -348,6 +348,22 @@ class QueryIntegrationTests : SQLiteTestCase {
         }
     }
 
+    func test_select_optional() {
+        for _ in try! db.prepare(users) {
+            // FIXME
+        }
+
+        let managerId = Expression<Int64?>("manager_id")
+        let managers = users.alias("managers")
+
+        let alice = try! db.run(users.insert(email <- "[email protected]"))
+        _ = try! db.run(users.insert(email <- "[email protected]", managerId <- alice))
+
+        for user in try! db.prepare(users.join(managers, on: managers[id] == users[managerId])) {
+            _ = user[users[managerId]]
+        }
+    }
+
     func test_scalar() {
         XCTAssertEqual(0, try! db.scalar(users.count))
         XCTAssertEqual(false, try! db.scalar(users.exists))