support HasMany in a Join

Author: adlanelm

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

@@ -5,6 +5,7 @@
 using FluentNHibernate.Conventions;
 using FluentNHibernate.Conventions.Inspections;
 using FluentNHibernate.MappingModel;
+using FluentNHibernate.MappingModel.Collections;
 using FluentNHibernate.Utils.Reflection;
 using NUnit.Framework;
 
@@ -43,6 +44,27 @@ public void AnysCollectionIsEmpty()
             inspector.Anys.IsEmpty().ShouldBeTrue();
         }
 
+        [Test]
+        public void CollectionsCollectionHasSameCountAsMapping()
+        {
+            mapping.AddCollection(new BagMapping());
+            inspector.Collections.Count().ShouldEqual(1);
+        }
+
+        [Test]
+        public void CollectionsCollectionOfInspectors()
+        {
+            mapping.AddCollection(new BagMapping());
+            inspector.Collections.First().ShouldBeOfType<ICollectionInspector>();
+        }
+
+        [Test]
+        public void CollectionsCollectionIsEmpty()
+        {
+            inspector.Collections.IsEmpty().ShouldBeTrue();
+        }
+
+
         [Test]
         public void CatalogMapped()
         {

src/FluentNHibernate.Testing/FluentInterfaceTests/JoinSubPartModelGenerationTests.cs

@@ -56,6 +56,14 @@ public void ReferencesShouldAddToReferencesCollectionOnModel()
                 .ModelShouldMatch(x => x.References.Count().ShouldEqual(1));
         }
 
+        [Test]
+        public void HasManyShouldAddToCollectionsCollectionOnModel()
+        {
+            Join<OneToManyTarget>("table")
+                .Mapping(m => m.HasMany(x => x.BagOfChildren))
+                .ModelShouldMatch(x => x.Collections.Count().ShouldEqual(1));
+        }
+
         [Test]
         public void ReferencesAnyShouldAddToAnyCollectionOnModel()
         {

src/FluentNHibernate.Testing/MappingModel/Output/XmlJoinWriterTester.cs

@@ -1,5 +1,6 @@
 using FluentNHibernate.MappingModel;
 using FluentNHibernate.MappingModel.ClassBased;
+using FluentNHibernate.MappingModel.Collections;
 using FluentNHibernate.MappingModel.Output;
 using FluentNHibernate.Testing.DomainModel.Mapping;
 using FluentNHibernate.Testing.Testing;
@@ -148,5 +149,16 @@ public void ShouldWriteAny()
             writer.VerifyXml(mapping)
                 .Element("any").Exists();
         }
+
+        [Test]
+        public void ShouldWriteCollection()
+        {
+            var mapping = new JoinMapping();
+
+            mapping.AddCollection(new BagMapping());
+
+            writer.VerifyXml(mapping)
+                .Element("bag").Exists();
+        }
     }
 }

src/FluentNHibernate/Conventions/Inspections/IJoinInspector.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using FluentNHibernate.MappingModel.Collections;
 
 namespace FluentNHibernate.Conventions.Inspections
 {
@@ -11,6 +12,7 @@ public interface IJoinInspector : IInspector
         bool Optional { get; }
         IEnumerable<IPropertyInspector> Properties { get; }
         IEnumerable<IManyToOneInspector> References { get; }
+        IEnumerable<ICollectionInspector> Collections { get;}
         string Schema { get; }
         string TableName { get; }
         string Catalog { get; }

src/FluentNHibernate/Conventions/Inspections/JoinInspector.cs

@@ -87,6 +87,17 @@ public IEnumerable<IManyToOneInspector> References
             }
         }
 
+
+        public IEnumerable<ICollectionInspector> Collections
+        {
+            get
+            {
+                return mapping.Collections
+                    .Select(x => new CollectionInspector(x))
+                    .Cast<ICollectionInspector>();
+            }
+        }
+
         public string Schema
         {
             get { return mapping.Schema; }

src/FluentNHibernate/Mapping/JoinPart.cs

@@ -159,6 +159,9 @@ JoinMapping IJoinMappingProvider.GetJoinMapping()
             foreach (var any in providers.Anys)
                 mapping.AddAny(any.GetAnyMapping());
 
+            foreach (var collection in providers.Collections)
+                mapping.AddCollection(collection.GetCollectionMapping());
+
             return mapping;
         }
     }

src/FluentNHibernate/MappingModel/JoinMapping.cs

@@ -4,6 +4,7 @@
 using System.Reflection;
 using FluentNHibernate.Mapping;
 using FluentNHibernate.MappingModel.ClassBased;
+using FluentNHibernate.MappingModel.Collections;
 using FluentNHibernate.Visitors;
 
 namespace FluentNHibernate.MappingModel
@@ -51,6 +52,11 @@ public IEnumerable<AnyMapping> Anys
             get { return mappedMembers.Anys; }
         }
 
+        public IEnumerable<ICollectionMapping> Collections
+        {
+            get { return mappedMembers.Collections; }
+        }
+
         public void AddProperty(PropertyMapping property)
         {
             mappedMembers.AddProperty(property);
@@ -71,6 +77,11 @@ public void AddAny(AnyMapping mapping)
             mappedMembers.AddAny(mapping);
         }
 
+        public void AddCollection(ICollectionMapping collectionMapping)
+        {
+            mappedMembers.AddCollection(collectionMapping);
+        }
+
         public string TableName
         {
             get { return attributes.Get(x => x.TableName); }

src/FluentNHibernate/MappingModel/Output/XmlJoinWriter.cs

@@ -1,5 +1,6 @@
 using System.Xml;
 using FluentNHibernate.MappingModel.ClassBased;
+using FluentNHibernate.MappingModel.Collections;
 using FluentNHibernate.Utils;
 using FluentNHibernate.Visitors;
 
@@ -89,5 +90,13 @@ public override void Visit(AnyMapping mapping)
 
             document.ImportAndAppendChild(xml);
         }
+
+        public override void Visit(ICollectionMapping mapping)
+        {
+            var writer = serviceLocator.GetWriter<ICollectionMapping>();
+            var xml = writer.Write(mapping);
+
+            document.ImportAndAppendChild(xml);
+        }
     }
 }