Merge pull request #1 from degert/master

Quick fix for #123: Append cascade options instead of overwriting.

Author: jaxx

src/FluentNHibernate.Testing/FluentInterfaceTests/ManyToOneMutablePropertyModelGenerationTests.cs

@@ -25,6 +25,14 @@ public void CascadeShouldSetModelCascadePropertyToValue()
                 .ModelShouldMatch(x => x.Cascade.ShouldEqual("all"));
         }
 
+        [Test]
+        public void CascadeShouldAppendModelCascadePropertyToValue()
+        {
+            ManyToOne()
+                .Mapping(m => { m.Cascade.SaveUpdate(); m.Cascade.Merge(); })
+                .ModelShouldMatch(x => x.Cascade.ShouldEqual("save-update,merge"));
+        }
+
         [Test]
         public void ShouldSetModelClassPropertyToPropertyType()
         {

src/FluentNHibernate.Testing/FluentInterfaceTests/OneToManyMutablePropertyModelGenerationTests.cs

@@ -45,6 +45,14 @@ public void CascadeShouldSetModelCascadePropertyToValue()
                 .ModelShouldMatch(x => x.Cascade.ShouldEqual("all"));
         }
 
+        [Test]
+        public void CascadeShouldAppendModelCascadePropertyToValue()
+        {
+            OneToMany(x => x.BagOfChildren)
+                .Mapping(m => { m.Cascade.SaveUpdate(); m.Cascade.Merge(); })
+                .ModelShouldMatch(x => x.Cascade.ShouldEqual("save-update,merge"));
+        }
+
         [Test]
         public void CollectionTypeShouldSetModelCollectionTypePropertyToValue()
         {

src/FluentNHibernate/Mapping/ManyToOnePart.cs

@@ -27,7 +27,11 @@ public ManyToOnePart(Type entity, Member member)
             this.member = member;
             access = new AccessStrategyBuilder<ManyToOnePart<TOther>>(this, value => attributes.Set("Access", Layer.UserSupplied, value));
             fetch = new FetchTypeExpression<ManyToOnePart<TOther>>(this, value => attributes.Set("Fetch", Layer.UserSupplied, value));
-            cascade = new CascadeExpression<ManyToOnePart<TOther>>(this, value => attributes.Set("Cascade", Layer.UserSupplied, value));
+            cascade = new CascadeExpression<ManyToOnePart<TOther>>(this, value =>
+                {
+                    var current = attributes.Get("Cascade") as string;
+                    attributes.Set("Cascade", Layer.UserSupplied, current == null ? value : string.Format("{0},{1}", current, value));
+                });
             notFound = new NotFoundExpression<ManyToOnePart<TOther>>(this, value => attributes.Set("NotFound", Layer.UserSupplied, value));
 
             SetDefaultAccess();

src/FluentNHibernate/Mapping/OneToManyPart.cs

@@ -31,7 +31,11 @@ protected OneToManyPart(Type entity, Member member, Type collectionType)
             childType = collectionType;
 
             keyColumns = new ColumnMappingCollection<OneToManyPart<TChild>>(this);
-            cascade = new CollectionCascadeExpression<OneToManyPart<TChild>>(this, value => collectionAttributes.Set("Cascade", Layer.UserSupplied, value));
+            cascade = new CollectionCascadeExpression<OneToManyPart<TChild>>(this, value => 
+                {
+                    var current = collectionAttributes.Get("Cascade") as string;
+                    collectionAttributes.Set("Cascade", Layer.UserSupplied, current == null ? value : string.Format("{0},{1}", current, value));
+                });
             notFound = new NotFoundExpression<OneToManyPart<TChild>>(this, value => relationshipAttributes.Set("NotFound", Layer.UserSupplied, value));
 
             collectionAttributes.Set("Name", Layer.Defaults, member.Name);