Merge branch 'expose_entity_type' of https://github.com/icambron/fluent-nhibernate into icambron-expose_entity_type

Conflicts:
	src/FluentNHibernate/Mapping/ManyToManyPart.cs
	src/FluentNHibernate/Mapping/ToManyBase.cs

Author: jagregory

src/FluentNHibernate/Mapping/ManyToManyPart.cs

@@ -9,7 +9,6 @@ namespace FluentNHibernate.Mapping
     public class ManyToManyPart<TChild> : ToManyBase<ManyToManyPart<TChild>, TChild, ManyToManyMapping>
     {
         private readonly IList<FilterPart> childFilters = new List<FilterPart>();
-        private readonly Type entity;
         private readonly FetchTypeExpression<ManyToManyPart<TChild>> fetch;
         private readonly NotFoundExpression<ManyToManyPart<TChild>> notFound;
         private IndexManyToManyPart manyToManyIndex;
@@ -23,13 +22,11 @@ public class ManyToManyPart<TChild> : ToManyBase<ManyToManyPart<TChild>, TChild,
         public ManyToManyPart(Type entity, Member property)
             : this(entity, property, property.PropertyType)
         {
-            childType = property.PropertyType;
         }
 
         protected ManyToManyPart(Type entity, Member member, Type collectionType)
             : base(entity, member, collectionType)
         {
-            this.entity = entity;
             childType = collectionType;
 
             fetch = new FetchTypeExpression<ManyToManyPart<TChild>>(this, value => collectionAttributes.Set(x => x.Fetch, value));
@@ -220,8 +217,7 @@ protected override ICollectionRelationshipMapping GetRelationship()
         {
             var mapping = new ManyToManyMapping(relationshipAttributes.CloneInner())
             {
-                ContainingEntityType = entity,
-
+                ContainingEntityType = EntityType,
             };
 
             if (isTernary && valueType != null)
@@ -336,7 +332,7 @@ protected override CollectionMapping GetCollectionMapping()
 
             // key columns
             if (parentKeyColumns.Count == 0)
-                collection.Key.AddDefaultColumn(new ColumnMapping { Name = entity.Name + "_id" });
+                collection.Key.AddDefaultColumn(new ColumnMapping { Name = EntityType.Name + "_id" });
 
             foreach (var column in parentKeyColumns)
                 collection.Key.AddColumn(column);

src/FluentNHibernate/Mapping/ToManyBase.cs

@@ -28,7 +28,7 @@ public abstract class ToManyBase<T, TChild, TRelationshipAttributes> : ICollecti
         private Func<AttributeStore, CollectionMapping> collectionBuilder;
         private IndexMapping indexMapping;
         protected Member member;
-        private Type entity;
+        private readonly Type entity;
 
         protected ToManyBase(Type entity, Member member, Type type)
         {
@@ -48,6 +48,15 @@ protected ToManyBase(Type entity, Member member, Type type)
             relationshipAttributes.SetDefault(x => x.Class, new TypeReference(typeof(TChild)));
         }
 
+		/// <summary>
+		/// Return the type of the owning entity
+		/// </summary>
+		/// <returns>Type</returns>
+    	public Type EntityType
+    	{
+			get { return entity; }
+    	}
+
         /// <summary>
         /// This method is used to set a different key column in this table to be used for joins.
         /// The output is set as the property-ref attribute in the "key" subelement of the collection