Merge pull request #286 from jaxx/master

chester89 · chester89 · commit 53980c601ef3 · 2014-12-17T16:55:39.000Z
append cascade options instead of overwriting + added missing cascade options
diff --git a/src/FluentNHibernate.Testing/DomainModel/Mapping/CascadeExpressionTester.cs b/src/FluentNHibernate.Testing/DomainModel/Mapping/CascadeExpressionTester.cs
@@ -63,5 +63,35 @@ public void Merge_should_add_the_correct_cascade_attribute_to_the_parent_part()
         {
             A_call_to(_cascade.Merge).should_set_the_cascade_value_to("merge");
         }
-	}
+
+        [Test]
+        public void Refresh_should_add_the_correct_cascade_attribute_to_the_parent_part()
+        {
+            A_call_to(_cascade.Refresh).should_set_the_cascade_value_to("refresh");
+        }
+
+        [Test]
+        public void DeleteOrphans_should_add_the_correct_cascade_attribute_to_the_parent_part()
+        {
+            A_call_to(_cascade.DeleteOrphans).should_set_the_cascade_value_to("delete-orphans");
+        }
+
+        [Test]
+        public void Evict_should_add_the_correct_cascade_attribute_to_the_parent_part()
+        {
+            A_call_to(_cascade.Evict).should_set_the_cascade_value_to("evict");
+        }
+
+        [Test]
+        public void Lock_should_add_the_correct_cascade_attribute_to_the_parent_part()
+        {
+            A_call_to(_cascade.Lock).should_set_the_cascade_value_to("lock");
+        }
+
+        [Test]
+        public void Persist_should_add_the_correct_cascade_attribute_to_the_parent_part()
+        {
+            A_call_to(_cascade.Persist).should_set_the_cascade_value_to("save-update, persist");
+        }
+    }
 }
diff --git a/src/FluentNHibernate.Testing/FluentInterfaceTests/ManyToOneMutablePropertyModelGenerationTests.cs b/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()
         {
diff --git a/src/FluentNHibernate.Testing/FluentInterfaceTests/OneToManyMutablePropertyModelGenerationTests.cs b/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()
         {
diff --git a/src/FluentNHibernate/Mapping/CascadeExpression.cs b/src/FluentNHibernate/Mapping/CascadeExpression.cs
@@ -3,7 +3,7 @@
 namespace FluentNHibernate.Mapping
 {
     public class CascadeExpression<TParent>
-	{
+    {
         private readonly TParent parent;
         private readonly Action<string> setter;
 
@@ -17,40 +17,40 @@ public CascadeExpression(TParent parent, Action<string> setter)
         /// Cascade all actions
         /// </summary>
         public TParent All()
-		{
-			setter("all");
-			return parent;
-		}
+        {
+            setter("all");
+            return parent;
+        }
 
         /// <summary>
         /// Cascade no actions
         /// </summary>
-		public TParent None()
-		{
-			setter("none");
+        public TParent None()
+        {
+            setter("none");
             return parent;
-		}
+        }
 
         /// <summary>
         /// Cascade saves and updates
         /// </summary>
-		public TParent SaveUpdate()
-		{
-			setter("save-update");
+        public TParent SaveUpdate()
+        {
+            setter("save-update");
             return parent;
-		}
+        }
 
         /// <summary>
         /// Cascade deletes
         /// </summary>
-		public TParent Delete()
-		{
-			setter("delete");
+        public TParent Delete()
+        {
+            setter("delete");
             return parent;
-		}
+        }
 
         /// <summary>
-        /// Cascade deletes
+        /// Cascade merges
         /// </summary>
         public TParent Merge()
         {
@@ -66,5 +66,50 @@ public TParent Replicate()
             setter("replicate");
             return parent;
         }
-	}
-}
+
+        /// <summary>
+        /// Cascade refreshes
+        /// </summary>
+        public TParent Refresh()
+        {
+            setter("refresh");
+            return parent;
+        }
+
+        /// <summary>
+        /// Cascade deletes orphans
+        /// </summary>
+        public TParent DeleteOrphans()
+        {
+            setter("delete-orphans");
+            return parent;
+        }
+
+        /// <summary>
+        /// Cascade evicts
+        /// </summary>
+        public TParent Evict()
+        {
+            setter("evict");
+            return parent;
+        }
+
+        /// <summary>
+        /// Cascade locks
+        /// </summary>
+        public TParent Lock()
+        {
+            setter("lock");
+            return parent;
+        }
+
+        /// <summary>
+        /// Cascade persists
+        /// </summary>
+        public TParent Persist()
+        {
+            setter("save-update, persist");
+            return parent;
+        }
+    }
+}
diff --git a/src/FluentNHibernate/Mapping/ManyToOnePart.cs b/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();
diff --git a/src/FluentNHibernate/Mapping/OneToManyPart.cs b/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);

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,14 @@ public void CascadeShouldSetModelCascadePropertyToValue()`
`25`	`25`	`.ModelShouldMatch(x => x.Cascade.ShouldEqual("all"));`
`26`	`26`	`}`
`27`	`27`
	`28`	`+ [Test]`
	`29`	`+ public void CascadeShouldAppendModelCascadePropertyToValue()`
	`30`	`+ {`
	`31`	`+ ManyToOne()`
	`32`	`+ .Mapping(m => { m.Cascade.SaveUpdate(); m.Cascade.Merge(); })`
	`33`	`+ .ModelShouldMatch(x => x.Cascade.ShouldEqual("save-update,merge"));`
	`34`	`+ }`
	`35`	`+`
`28`	`36`	`[Test]`
`29`	`37`	`public void ShouldSetModelClassPropertyToPropertyType()`
`30`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,14 @@ public void CascadeShouldSetModelCascadePropertyToValue()`
`45`	`45`	`.ModelShouldMatch(x => x.Cascade.ShouldEqual("all"));`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ [Test]`
	`49`	`+ public void CascadeShouldAppendModelCascadePropertyToValue()`
	`50`	`+ {`
	`51`	`+ OneToMany(x => x.BagOfChildren)`
	`52`	`+ .Mapping(m => { m.Cascade.SaveUpdate(); m.Cascade.Merge(); })`
	`53`	`+ .ModelShouldMatch(x => x.Cascade.ShouldEqual("save-update,merge"));`
	`54`	`+ }`
	`55`	`+`
`48`	`56`	`[Test]`
`49`	`57`	`public void CollectionTypeShouldSetModelCollectionTypePropertyToValue()`
`50`	`58`	`{`