Merge pull request #91 from hazzik/many-to-many-where

Added generic version of `ChildWhere` for many-to-many part.

Author: jagregory

src/FluentNHibernate.Testing/FluentInterfaceTests/ManyToManyMutablePropertyModelGenerationTests.cs

@@ -272,6 +272,14 @@ public void ChildWhereShouldSetAttributeOnRelationshipModel()
                 .ModelShouldMatch(x => ((ManyToManyMapping)x.Relationship).Where.ShouldEqual("some condition"));
         }
 
+        [Test]
+        public void GenericChildWhereShouldSetAttributeOnRelationshipModel()
+        {
+            ManyToMany(x => x.BagOfChildren)
+                .Mapping(m => m.ChildWhere(x => x.Name == "Name"))
+                .ModelShouldMatch(x => ((ManyToManyMapping)x.Relationship).Where.ShouldEqual("Name = 'Name'"));
+        }
+
         [Test]
         public void EntityNameShouldSetModelValue()
         {

src/FluentNHibernate.Testing/FluentInterfaceTests/WhereTests.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Linq.Expressions;
 using FluentNHibernate.Mapping;
-using FluentNHibernate.Testing.DomainModel.Mapping;
 using NUnit.Framework;
 
 namespace FluentNHibernate.Testing.FluentInterfaceTests

src/FluentNHibernate/Mapping/ManyToManyPart.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq.Expressions;
 using FluentNHibernate.Mapping.Providers;
 using FluentNHibernate.MappingModel;
 using FluentNHibernate.MappingModel.Collections;
+using FluentNHibernate.Utils;
 
 namespace FluentNHibernate.Mapping
 {
@@ -327,6 +329,17 @@ public ManyToManyPart<TChild> ChildWhere(string where)
             return this;
         }
 
+        /// <summary>
+        /// Sets the where clause for this relationship, on the many-to-many element.
+        /// Note: This only supports simple cases, use the string overload for more complex clauses.
+        /// </summary>
+        public ManyToManyPart<TChild> ChildWhere(Expression<Func<TChild, bool>> where)
+        {
+            var sql = ExpressionToSql.Convert(where);
+
+            return ChildWhere(sql);
+        }
+
         protected override CollectionMapping GetCollectionMapping()
         {
             var collection = base.GetCollectionMapping();

src/FluentNHibernate/Mapping/OneToManyPart.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using FluentNHibernate.MappingModel;
 using FluentNHibernate.MappingModel.Collections;
+using FluentNHibernate.Utils;
 
 namespace FluentNHibernate.Mapping
 {
@@ -217,5 +219,16 @@ void EnsureGenericDictionary()
             if (!(childType.IsGenericType && childType.GetGenericTypeDefinition() == typeof(IDictionary<,>)))
                 throw new ArgumentException(member.Name + " must be of type IDictionary<> to be used in a ternary assocation. Type was: " + childType);
         }
+
+        /// <summary>
+        /// Sets the where clause for this one-to-many relationship.
+        /// Note: This only supports simple cases, use the string overload for more complex clauses.
+        /// </summary>
+        public OneToManyPart<TChild> Where(Expression<Func<TChild, bool>> where)
+        {
+            var sql = ExpressionToSql.Convert(where);
+
+            return Where(sql);
+        }
     }
 }

src/FluentNHibernate/Mapping/ToManyBase.cs

@@ -537,17 +537,6 @@ public T Generic()
             return (T)this;
         }
 
-        /// <summary>
-        /// Sets the where clause for this one-to-many relationship.
-        /// Note: This only supports simple cases, use the string overload for more complex clauses.
-        /// </summary>
-        public T Where(Expression<Func<TChild, bool>> where)
-        {
-            var sql = ExpressionToSql.Convert(where);
-
-            return Where(sql);
-        }
-
         /// <summary>
         /// Sets the where clause for this one-to-many relationship.
         /// </summary>