Include table name in UC generated name

mythz · mythz · commit b20e64d0c26c · 2018-03-05T22:59:24.000-05:00
diff --git a/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs b/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs
@@ -1222,15 +1222,15 @@ public virtual string ToCreateTableStatement(Type tableType)
         public virtual string GetUniqueConstraints(ModelDefinition modelDef)
         {
             var constraints = modelDef.UniqueConstraints.Map(x => 
-                $"CONSTRAINT {GetUniqueConstraintName(x)} UNIQUE ({x.FieldNames.Map(f => modelDef.GetQuotedName(f,this)).Join(",")})" );
+                $"CONSTRAINT {GetUniqueConstraintName(x, GetTableName(modelDef))} UNIQUE ({x.FieldNames.Map(f => modelDef.GetQuotedName(f,this)).Join(",")})" );
 
             return constraints.Count > 0
                 ? constraints.Join(",\n")
                 : null;
         }
 
-        protected virtual string GetUniqueConstraintName(UniqueConstraintAttribute constraint) =>
-            constraint.Name ?? $"UC_{constraint.FieldNames.Join("_")}";
+        protected virtual string GetUniqueConstraintName(UniqueConstraintAttribute constraint, string tableName) =>
+            constraint.Name ?? $"UC_{tableName}_{constraint.FieldNames.Join("_")}";
 
         public virtual string GetCheckConstraint(FieldDefinition fieldDef)
         {

Original file line number	Diff line number	Diff line change
`@@ -1222,15 +1222,15 @@ public virtual string ToCreateTableStatement(Type tableType)`
`1222`	`1222`	`public virtual string GetUniqueConstraints(ModelDefinition modelDef)`
`1223`	`1223`	`{`
`1224`	`1224`	`var constraints = modelDef.UniqueConstraints.Map(x =>`
`1225`		`- $"CONSTRAINT {GetUniqueConstraintName(x)} UNIQUE ({x.FieldNames.Map(f => modelDef.GetQuotedName(f,this)).Join(",")})" );`
	`1225`	`+ $"CONSTRAINT {GetUniqueConstraintName(x, GetTableName(modelDef))} UNIQUE ({x.FieldNames.Map(f => modelDef.GetQuotedName(f,this)).Join(",")})" );`
`1226`	`1226`
`1227`	`1227`	`return constraints.Count > 0`
`1228`	`1228`	`? constraints.Join(",\n")`
`1229`	`1229`	`: null;`
`1230`	`1230`	`}`
`1231`	`1231`
`1232`		`- protected virtual string GetUniqueConstraintName(UniqueConstraintAttribute constraint) =>`
`1233`		`- constraint.Name ?? $"UC_{constraint.FieldNames.Join("_")}";`
	`1232`	`+ protected virtual string GetUniqueConstraintName(UniqueConstraintAttribute constraint, string tableName) =>`
	`1233`	`+ constraint.Name ?? $"UC_{tableName}_{constraint.FieldNames.Join("_")}";`
`1234`	`1234`
`1235`	`1235`	`public virtual string GetCheckConstraint(FieldDefinition fieldDef)`
`1236`	`1236`	`{`