Merge pull request nhibernate#108 from tchrikch/master

Added cascade.merge option

src/FluentNHibernate.Testing/ConventionsTests/Inspection/CascadeTests.cs

@@ -47,5 +47,12 @@ public void DirtyShouldHaveCorrectValue()
         {
             Cascade.SaveUpdate.ToString().ShouldEqual("save-update");
         }
+
+        [Test]
+        public void MergeShouldHaveCorrectValue()
+        {
+            Cascade.All.ToString().ShouldEqual("merge");
+        }
+
     }
 }

src/FluentNHibernate.Testing/DomainModel/Mapping/CascadeExpressionTester.cs

@@ -58,5 +58,11 @@ public void Delete_should_add_the_correct_cascade_attribute_to_the_parent_part()
 		{
 			A_call_to(_cascade.Delete).should_set_the_cascade_value_to("delete");
 		}
+
+        [Test]
+        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");
+        }
 	}
 }

src/FluentNHibernate/Conventions/Helpers/DefaultCascade.cs

@@ -31,5 +31,13 @@ public static IHibernateMappingConvention Delete()
                 criteria => { },
                 instance => instance.DefaultCascade.Delete());
         }
+
+
+        public static IHibernateMappingConvention Merge()
+        {
+            return new BuiltHibernateMappingConvention(
+                criteria => { },
+                instance => instance.DefaultCascade.Merge());
+        }
     }
 }

src/FluentNHibernate/Conventions/Inspections/Cascade.cs

@@ -8,6 +8,7 @@ public class Cascade
         public static readonly Cascade None = new Cascade("none");
         public static readonly Cascade SaveUpdate = new Cascade("save-update");
         public static readonly Cascade Delete = new Cascade("delete");
+        public static readonly Cascade Merge = new Cascade("merge");
 
         private readonly string value;
 

src/FluentNHibernate/Conventions/Instances/CascadeInstance.cs

@@ -30,5 +30,10 @@ public void Delete()
         {
             setter("delete");
         }
+
+        public void Merge()
+        {
+            setter("merge");
+        }
     }
 }

src/FluentNHibernate/Conventions/Instances/ICascadeInstance.cs

@@ -8,5 +8,6 @@ public interface ICascadeInstance
         void None();
         void SaveUpdate();
         void Delete();
+        void Merge();
     }
 }

src/FluentNHibernate/Mapping/CascadeExpression.cs

@@ -48,5 +48,16 @@ public TParent Delete()
 			setter("delete");
             return parent;
 		}
+
+        /// <summary>
+        /// Cascade deletes
+        /// </summary>
+        public TParent Merge()
+        {
+            setter("merge");
+            return parent;
+        }
+
+
 	}
 }