Merge pull request #522 from vapor/unique-constraint-name-fix

unique constraint name fix
vapor · Jun 20, 2018 · f8378e3 · f8378e3
2 parents a821d46 + 08e20c8
commit f8378e3
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Sources/FluentSQL/SQL+SchemaSupporting.swift b/Sources/FluentSQL/SQL+SchemaSupporting.swift
@@ -97,7 +97,12 @@ extension SchemaSupporting where
 {
     /// See `SchemaSupporting`.
     public static func schemaUnique(on: [QueryField]) -> SchemaConstraint {
-        let uid = on.map { $0.identifier.string }.joined(separator: "+")
+        let uid = on.map {
+            guard let table = $0.table else {
+                fatalError("Cannot create unique constraint on column without table identifier: \($0).")
+            }
+            return "\(table.identifier.string).\($0.identifier.string)"
+        }.joined(separator: "+")
         return .constraint(.unique(on.map { $0.identifier }), .identifier("uq:\(normalizeSQLConstraintIdentifier(uid))"))
     }
 }