Fix combining cascades

hazzik · hazzik · commit e4c6e1667173 · 2020-10-09T21:35:47.000+13:00
Fixes #472 +semver:fix
diff --git a/src/FluentNHibernate.Testing/FluentInterfaceTests/AnyMutablePropertyModelGenerationTests.cs b/src/FluentNHibernate.Testing/FluentInterfaceTests/AnyMutablePropertyModelGenerationTests.cs
@@ -33,6 +33,18 @@ public void CascadeSetsModelCascadePropertyToValue()
                 .ModelShouldMatch(x => x.Cascade.ShouldEqual("all"));
         }
 
+        [Test]
+        public void CascadeAppendModelCascadePropertyToValue()
+        {
+            Any<SecondMappedObject>()
+                .Mapping(m => m
+                    .IdentityType<int>()
+                    .EntityIdentifierColumn("col")
+                    .EntityTypeColumn("col2")
+                    .Cascade.Merge().Cascade.SaveUpdate())
+                .ModelShouldMatch(x => x.Cascade.ShouldEqual("merge,save-update"));
+        }
+
         [Test]
         public void IdentityTypeSetsModelIdTypePropertyToPropertyTypeName()
         {
diff --git a/src/FluentNHibernate.Testing/FluentInterfaceTests/HibernateMappingMutablePropertyModelGenerationTests.cs b/src/FluentNHibernate.Testing/FluentInterfaceTests/HibernateMappingMutablePropertyModelGenerationTests.cs
@@ -37,6 +37,14 @@ public void DefaultCascadeShouldSetModelDefaultCascadePropertyToValue()
                 .ModelShouldMatch(x => x.DefaultCascade.ShouldEqual("all"));
         }
 
+        [Test]
+        public void DefaultCascadeShouldAppendModelDefaultCascadePropertyToValue()
+        {
+            HibernateMapping()
+                .Mapping(m => { m.DefaultCascade.Merge(); m.DefaultCascade.SaveUpdate(); })
+                .ModelShouldMatch(x => x.DefaultCascade.ShouldEqual("merge,save-update"));
+        }
+
         [Test]
         public void DefaultLazyShouldSetModelDefaultLazyPropertyToTrue()
         {
diff --git a/src/FluentNHibernate.Testing/FluentInterfaceTests/ManyToManyMutablePropertyModelGenerationTests.cs b/src/FluentNHibernate.Testing/FluentInterfaceTests/ManyToManyMutablePropertyModelGenerationTests.cs
@@ -52,6 +52,14 @@ public void CascadeShouldSetModelCascadePropertyToValue()
                 .ModelShouldMatch(x => x.Cascade.ShouldEqual("all"));
         }
 
+        [Test]
+        public void CascadeShouldAppendModelCascadePropertyToValue()
+        {
+            ManyToMany(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.Testing/FluentInterfaceTests/OneToOneMutablePropertyModelGenerationTests.cs b/src/FluentNHibernate.Testing/FluentInterfaceTests/OneToOneMutablePropertyModelGenerationTests.cs
@@ -33,21 +33,37 @@ public void ClassShouldSetModelClassPropertyToValue()
         }
 
         [Test]
-        public void CascadeShouldSetModelCascadePropertyToTrue()
+        public void ConstrainedShouldSetModelConstrainedPropertyToTrue()
         {
             OneToOne()
                 .Mapping(m => m.Constrained())
                 .ModelShouldMatch(x => x.Constrained.ShouldBeTrue());
         }
 
         [Test]
-        public void NotCascadeShouldSetModelCascadePropertyToFalse()
+        public void NotConstrainedShouldSetModelConstrainedPropertyToFalse()
         {
             OneToOne()
                 .Mapping(m => m.Not.Constrained())
                 .ModelShouldMatch(x => x.Constrained.ShouldBeFalse());
         }
 
+        [Test]
+        public void CascadeSetsModelCascadePropertyToValue()
+        {
+            OneToOne()
+                .Mapping(m => m.Cascade.All())
+                .ModelShouldMatch(x => x.Cascade.ShouldEqual("all"));
+        }
+
+        [Test]
+        public void CascadeAppendModelCascadePropertyToValue()
+        {
+            OneToOne()
+                .Mapping(m => { m.Cascade.Merge(); m.Cascade.SaveUpdate(); })
+                .ModelShouldMatch(x => x.Cascade.ShouldEqual("merge,save-update"));
+        }
+
         [Test]
         public void FetchShouldSetModelFetchPropertyToValue()
         {
diff --git a/src/FluentNHibernate/Mapping/AnyPart.cs b/src/FluentNHibernate/Mapping/AnyPart.cs
@@ -31,7 +31,11 @@ public AnyPart(Type entity, Member member)
             this.entity = entity;
             this.member = member;
             access = new AccessStrategyBuilder<AnyPart<T>>(this, value => attributes.Set("Access", Layer.UserSupplied, value));
-            cascade = new CascadeExpression<AnyPart<T>>(this, value => attributes.Set("Cascade", Layer.UserSupplied, value));
+            cascade = new CascadeExpression<AnyPart<T>>(this, value =>
+            {
+                var current = attributes.Get("Cascade") as string;
+                attributes.Set("Cascade", Layer.UserSupplied, current == null ? value : string.Format("{0},{1}", current, value));
+            });
 
             SetDefaultAccess();
         }
diff --git a/src/FluentNHibernate/Mapping/HibernateMappingPart.cs b/src/FluentNHibernate/Mapping/HibernateMappingPart.cs
@@ -13,7 +13,11 @@ public class HibernateMappingPart : IHibernateMappingProvider
 
         public HibernateMappingPart()
         {
-            defaultCascade = new CascadeExpression<HibernateMappingPart>(this, value => attributes.Set("DefaultCascade", Layer.UserSupplied, value));
+            defaultCascade = new CascadeExpression<HibernateMappingPart>(this, value =>
+            {
+                var current = attributes.Get("DefaultCascade") as string;
+                attributes.Set("DefaultCascade", Layer.UserSupplied, current == null ? value : string.Format("{0},{1}", current, value));
+            });
             defaultAccess = new AccessStrategyBuilder<HibernateMappingPart>(this, value => attributes.Set("DefaultAccess", Layer.UserSupplied, value));
         }
 
diff --git a/src/FluentNHibernate/Mapping/OneToManyPart.cs b/src/FluentNHibernate/Mapping/OneToManyPart.cs
@@ -12,7 +12,6 @@ public class OneToManyPart<TChild> : ToManyBase<OneToManyPart<TChild>, TChild>
     {
         private readonly Type entity;
         private readonly ColumnMappingCollection<OneToManyPart<TChild>> keyColumns;
-        private readonly CollectionCascadeExpression<OneToManyPart<TChild>> cascade;
         private readonly NotFoundExpression<OneToManyPart<TChild>> notFound;
         private IndexManyToManyPart manyToManyIndex;
         private readonly Type childType;
@@ -31,11 +30,6 @@ protected OneToManyPart(Type entity, Member member, Type collectionType)
             childType = collectionType;
 
             keyColumns = new ColumnMappingCollection<OneToManyPart<TChild>>(this);
-            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);
@@ -54,7 +48,7 @@ public NotFoundExpression<OneToManyPart<TChild>> NotFound
         /// </summary>
         public new CollectionCascadeExpression<OneToManyPart<TChild>> Cascade
         {
-            get { return cascade; }
+            get { return base.Cascade; }
         }
 
         /// <summary>
diff --git a/src/FluentNHibernate/Mapping/OneToOnePart.cs b/src/FluentNHibernate/Mapping/OneToOnePart.cs
@@ -21,7 +21,11 @@ public OneToOnePart(Type entity, Member member)
         {
             access = new AccessStrategyBuilder<OneToOnePart<TOther>>(this, value => attributes.Set("Access", Layer.UserSupplied, value));
             fetch = new FetchTypeExpression<OneToOnePart<TOther>>(this, value => attributes.Set("Fetch", Layer.UserSupplied, value));
-            cascade = new CascadeExpression<OneToOnePart<TOther>>(this, value => attributes.Set("Cascade", Layer.UserSupplied, value));
+            cascade = new CascadeExpression<OneToOnePart<TOther>>(this, value =>
+            {
+                var current = attributes.Get("Cascade") as string;
+                attributes.Set("Cascade", Layer.UserSupplied, current == null ? value : string.Format("{0},{1}", current, value));
+            });
             this.entity = entity;
             this.member = member;
 
diff --git a/src/FluentNHibernate/Mapping/ToManyBase.cs b/src/FluentNHibernate/Mapping/ToManyBase.cs
@@ -36,7 +36,11 @@ protected ToManyBase(Type entity, Member member, Type type)
             AsBag();
             access = new AccessStrategyBuilder<T>((T)this, value => collectionAttributes.Set("Access", Layer.UserSupplied, value));
             fetch = new FetchTypeExpression<T>((T)this, value => collectionAttributes.Set("Fetch", Layer.UserSupplied, value));
-            cascade = new CollectionCascadeExpression<T>((T)this, value => collectionAttributes.Set("Cascade", Layer.UserSupplied, value));
+            cascade = new CollectionCascadeExpression<T>((T)this, value =>
+            {
+                var current = collectionAttributes.Get("Cascade") as string;
+                collectionAttributes.Set("Cascade", Layer.UserSupplied, current == null ? value : string.Format("{0},{1}", current, value));
+            });
 
             SetDefaultCollectionType();
             SetCustomCollectionType(type);

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,14 @@ public void DefaultCascadeShouldSetModelDefaultCascadePropertyToValue()`
`37`	`37`	`.ModelShouldMatch(x => x.DefaultCascade.ShouldEqual("all"));`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ [Test]`
	`41`	`+ public void DefaultCascadeShouldAppendModelDefaultCascadePropertyToValue()`
	`42`	`+ {`
	`43`	`+ HibernateMapping()`
	`44`	`+ .Mapping(m => { m.DefaultCascade.Merge(); m.DefaultCascade.SaveUpdate(); })`
	`45`	`+ .ModelShouldMatch(x => x.DefaultCascade.ShouldEqual("merge,save-update"));`
	`46`	`+ }`
	`47`	`+`
`40`	`48`	`[Test]`
`41`	`49`	`public void DefaultLazyShouldSetModelDefaultLazyPropertyToTrue()`
`42`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,14 @@ public void CascadeShouldSetModelCascadePropertyToValue()`
`52`	`52`	`.ModelShouldMatch(x => x.Cascade.ShouldEqual("all"));`
`53`	`53`	`}`
`54`	`54`
	`55`	`+ [Test]`
	`56`	`+ public void CascadeShouldAppendModelCascadePropertyToValue()`
	`57`	`+ {`
	`58`	`+ ManyToMany(x => x.BagOfChildren)`
	`59`	`+ .Mapping(m => { m.Cascade.SaveUpdate(); m.Cascade.Merge(); })`
	`60`	`+ .ModelShouldMatch(x => x.Cascade.ShouldEqual("save-update,merge"));`
	`61`	`+ }`
	`62`	`+`
`55`	`63`	`[Test]`
`56`	`64`	`public void CollectionTypeShouldSetModelCollectionTypePropertyToValue()`
`57`	`65`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,11 @@ public class HibernateMappingPart : IHibernateMappingProvider`
`13`	`13`
`14`	`14`	`public HibernateMappingPart()`
`15`	`15`	`{`
`16`		`- defaultCascade = new CascadeExpression<HibernateMappingPart>(this, value => attributes.Set("DefaultCascade", Layer.UserSupplied, value));`
	`16`	`+ defaultCascade = new CascadeExpression<HibernateMappingPart>(this, value =>`
	`17`	`+ {`
	`18`	`+ var current = attributes.Get("DefaultCascade") as string;`
	`19`	`+ attributes.Set("DefaultCascade", Layer.UserSupplied, current == null ? value : string.Format("{0},{1}", current, value));`
	`20`	`+ });`
`17`	`21`	`defaultAccess = new AccessStrategyBuilder<HibernateMappingPart>(this, value => attributes.Set("DefaultAccess", Layer.UserSupplied, value));`
`18`	`22`	`}`
`19`	`23`