Merge branch 'NH-1262' of https://github.com/mickfold/nhibernate-core into NH-1262

mickfold · mickfold · commit 9b66c9da51c1 · 2014-11-19T21:45:21.000Z
Conflicts:
	src/NHibernate/Engine/Cascade.cs
diff --git a/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs b/src/NHibernate/Cfg/XmlHbmBinding/PropertiesBinder.cs
@@ -241,6 +241,11 @@ private void BindManyToOne(HbmManyToOne manyToOneMapping, ManyToOne model, strin
 				model.IsLogicalOneToOne = true;
 			}
 
+			if (manyToOneMapping.unique)
+			{
+				model.IsLogicalOneToOne = true;
+			}
+
 			BindForeignKey(manyToOneMapping.foreignkey, model);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,11 @@ private void BindManyToOne(HbmManyToOne manyToOneMapping, ManyToOne model, strin`
`241`	`241`	`model.IsLogicalOneToOne = true;`
`242`	`242`	`}`
`243`	`243`
	`244`	`+ if (manyToOneMapping.unique)`
	`245`	`+ {`
	`246`	`+ model.IsLogicalOneToOne = true;`
	`247`	`+ }`
	`248`	`+`
`244`	`249`	`BindForeignKey(manyToOneMapping.foreignkey, model);`
`245`	`250`	`}`
`246`	`251`