removing throwing from Model atomic create + fix id overwrite bug

vapor · Jun 16, 2018 · 1ad690c · 1ad690c
1 parent 30d769b
commit 1ad690c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Sources/FluentMySQL/Exports.swift b/Sources/FluentMySQL/Exports.swift
@@ -64,10 +64,10 @@ extension QueryBuilder where Result: Model, Result.Database == Database, Databas
 }
 
 extension Model where Database == MySQLDatabase {
-    public func create(orIgnore: Bool, on conn: DatabaseConnectable) throws -> Future<Self> {
+    public func create(orIgnore: Bool, on conn: DatabaseConnectable) -> Future<Self> {
         return Self.query(on: conn).create(orIgnore: orIgnore, self)
     }
-    public func create(orUpdate: Bool, on conn: DatabaseConnectable) throws -> Future<Self> {
+    public func create(orUpdate: Bool, on conn: DatabaseConnectable) -> Future<Self> {
         return Self.query(on: conn).create(orUpdate: orUpdate, self)
     }
 }
diff --git a/Sources/FluentMySQL/MySQLDatabase+QuerySupporting.swift b/Sources/FluentMySQL/MySQLDatabase+QuerySupporting.swift
@@ -168,9 +168,9 @@ extension MySQLDatabase: QuerySupporting {
                 copy.fluentID = UUID() as? M.ID
             }
         case .didCreate:
-            if M.ID.self is Int.Type {
+            if let idType = M.ID.self as? UInt64Initializable.Type, copy.fluentID == nil {
                 // FIXME: support other Int types
-                copy.fluentID = conn.lastMetadata?.lastInsertID.flatMap(Int.init) as? M.ID
+                copy.fluentID = conn.lastMetadata?.lastInsertID.flatMap(idType.init) as? M.ID
             }
         default: break
         }
@@ -391,3 +391,12 @@ extension MySQLDatabase: QuerySupporting {
         query.orderBy.append(orderBy)
     }
 }
+
+internal protocol UInt64Initializable {
+    init(_ uint64: UInt64)
+}
+
+extension Int32: UInt64Initializable { }
+extension Int64: UInt64Initializable { }
+extension UInt32: UInt64Initializable { }
+extension UInt64: UInt64Initializable { }