Merge pull request #76 from MihaelIsaev/master

tanner0101 · web-flow · commit eea3a44c9d72 · 2018-07-25T20:57:07.000-04:00
Allow to create model with pre-given UUID idKey
diff --git a/Sources/FluentPostgreSQL/PostgreSQLDatabase+QuerySupporting.swift b/Sources/FluentPostgreSQL/PostgreSQLDatabase+QuerySupporting.swift
@@ -105,7 +105,7 @@ extension PostgreSQLDatabase: QuerySupporting {
     {
         switch event {
         case .willCreate:
-            if M.ID.self == UUID.self {
+            if M.ID.self == UUID.self, model.fluentID == nil {
                 var model = model
                 model.fluentID = UUID() as? M.ID
                 return conn.future(model)

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ extension PostgreSQLDatabase: QuerySupporting {`
`105`	`105`	`{`
`106`	`106`	`switch event {`
`107`	`107`	`case .willCreate:`
`108`		`- if M.ID.self == UUID.self {`
	`108`	`+ if M.ID.self == UUID.self, model.fluentID == nil {`
`109`	`109`	`var model = model`
`110`	`110`	`model.fluentID = UUID() as? M.ID`
`111`	`111`	`return conn.future(model)`