Merge pull request #32 from vapor/property-wrapper-2

property wrappers
vapor · Jul 31, 2019 · 074b34f · 074b34f
2 parents d6f68b8 + 151575d
commit 074b34f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Package.swift b/Package.swift
@@ -7,7 +7,7 @@ let package = Package(
         .library(name: "FluentSQLiteDriver", targets: ["FluentSQLiteDriver"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.0.0-alpha"),
+        .package(url: "https://github.com/vapor/fluent-kit.git", .branch("master")),
         .package(url: "https://github.com/vapor/sqlite-kit.git", from: "4.0.0-alpha"),
     ],
     targets: [

diff --git a/Sources/FluentSQLiteDriver/SQLiteConnection+Database.swift b/Sources/FluentSQLiteDriver/SQLiteConnection+Database.swift
@@ -34,19 +34,24 @@ private struct LastInsertRow: DatabaseOutput {
 
     let lastAutoincrementID: Int64?
 
+    init(lastAutoincrementID: Int64?) {
+        self.lastAutoincrementID = lastAutoincrementID
+    }
+
     func contains(field: String) -> Bool {
         return field == "fluentID"
     }
 
     func decode<T>(field: String, as type: T.Type) throws -> T where T : Decodable {
         switch field {
         case "fluentID":
-            if T.self is Int.Type {
+            if T.self is Int?.Type || T.self is Int.Type {
                 return Int(self.lastAutoincrementID!) as! T
             } else {
-                fatalError()
+                fatalError("cannot decode last autoincrement type: \(T.self)")
             }
-        default: throw FluentError.missingField(name: field)
+        default:
+            throw FluentError.missingField(name: field)
         }
     }
 }