[Nhibernate-commit] SF.net SVN: nhibernate:[5612] trunk/nhibernate/src/NHibernate

[<fab...@us...>]

Revision: 5612
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5612&view=rev
Author:   fabiomaulo
Date:     2011-04-05 17:48:10 +0000 (Tue, 05 Apr 2011)

Log Message:
-----------
SubclassMapper with Joins

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Mapping/ByCode/ISubclassMapper.cs
    trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/SubclassMapper.cs
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/SubclassMapperWithJoinPropertiesTest.cs

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ISubclassMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ISubclassMapper.cs	2011-04-05 17:26:13 UTC (rev 5611)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ISubclassMapper.cs	2011-04-05 17:48:10 UTC (rev 5612)
@@ -1,3 +1,5 @@
+using System;
+
 namespace NHibernate.Mapping.ByCode
 {
 	public interface ISubclassAttributesMapper : IEntityAttributesMapper, IEntitySqlsMapper
@@ -6,12 +8,17 @@
 		void Extends(System.Type baseType);
 	}
 
-	public interface ISubclassMapper : ISubclassAttributesMapper, IPropertyContainerMapper {}
+	public interface ISubclassMapper : ISubclassAttributesMapper, IPropertyContainerMapper
+	{
+		void Join(string splitGroupId, Action<IJoinMapper> splittedMapping);
+	}
 
 	public interface ISubclassAttributesMapper<TEntity> : IEntityAttributesMapper, IEntitySqlsMapper where TEntity : class
 	{
 		void DiscriminatorValue(object value);
 	}
 
-	public interface ISubclassMapper<TEntity> : ISubclassAttributesMapper<TEntity>, IPropertyContainerMapper<TEntity> where TEntity : class {}
+	public interface ISubclassMapper<TEntity> : ISubclassAttributesMapper<TEntity>, IPropertyContainerMapper<TEntity> where TEntity : class
+	{
+	}
 }
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/SubclassMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/SubclassMapper.cs	2011-04-05 17:26:13 UTC (rev 5611)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/SubclassMapper.cs	2011-04-05 17:48:10 UTC (rev 5612)
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using NHibernate.Cfg.MappingSchema;
 using NHibernate.Persister.Entity;
@@ -8,6 +9,7 @@
 	public class SubclassMapper : AbstractPropertyContainerMapper, ISubclassMapper
 	{
 		private readonly HbmSubclass classMapping = new HbmSubclass();
+		private Dictionary<string, IJoinMapper> joinMappers;
 
 		public SubclassMapper(System.Type subClass, HbmMapping mapDoc) : base(subClass, mapDoc)
 		{
@@ -31,6 +33,11 @@
 
 		#endregion
 
+		private Dictionary<string, IJoinMapper> JoinMappers
+		{
+			get { return joinMappers ?? (joinMappers = new Dictionary<string, IJoinMapper>()); }
+		}
+
 		#region ISubclassMapper Members
 
 		public void DiscriminatorValue(object value)
@@ -52,6 +59,21 @@
 			classMapping.extends = baseType.GetShortClassName(MapDoc);
 		}
 
+		public void Join(string splitGroupId, Action<IJoinMapper> splittedMapping)
+		{
+			IJoinMapper splitGroup;
+			if (!JoinMappers.TryGetValue(splitGroupId, out splitGroup))
+			{
+				var hbmJoin = new HbmJoin();
+				splitGroup = new JoinMapper(Container, splitGroupId, hbmJoin, MapDoc);
+				var toAdd = new[] { hbmJoin };
+				JoinMappers.Add(splitGroupId, splitGroup);
+				classMapping.join = classMapping.join == null ? toAdd : classMapping.join.Concat(toAdd).ToArray();
+			}
+
+			splittedMapping(splitGroup);
+		}
+
 		#endregion
 
 		#region Implementation of IEntityAttributesMapper

Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/SubclassMapperWithJoinPropertiesTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/SubclassMapperWithJoinPropertiesTest.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/SubclassMapperWithJoinPropertiesTest.cs	2011-04-05 17:48:10 UTC (rev 5612)
@@ -0,0 +1,81 @@
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NHibernate.Mapping.ByCode.Impl;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.MappingByCode.MappersTests
+{
+	public class SubclassMapperWithJoinPropertiesTest
+	{
+		private class MyClass
+		{
+			public int Id { get; set; }
+		}
+
+		private class Inherited : MyClass
+		{
+		}
+
+		[Test]
+		public void WhenDefineJoinThenAddJoinWithTableNameAndKey()
+		{
+			var mapdoc = new HbmMapping();
+			var mapper = new SubclassMapper(typeof(Inherited), mapdoc);
+
+			mapper.Join("MyTable", x => { });
+
+			var hbmClass = mapdoc.SubClasses[0];
+			var hbmJoin = hbmClass.Joins.Single();
+			hbmJoin.table.Should().Be("MyTable");
+			hbmJoin.key.Should().Not.Be.Null();
+			hbmJoin.key.column1.Should().Not.Be.Null();
+		}
+
+		[Test]
+		public void WhenDefineJoinThenCallJoinMapper()
+		{
+			var mapdoc = new HbmMapping();
+			var mapper = new SubclassMapper(typeof(Inherited), mapdoc);
+			var called = false;
+			mapper.Join("MyTable", x =>
+			{
+				x.Should().Not.Be.Null();
+				called = true;
+			});
+
+			called.Should().Be.True();
+		}
+
+		[Test]
+		public void WhenDefineMoreJoinsThenTableNameShouldBeUnique()
+		{
+			var mapdoc = new HbmMapping();
+			var mapper = new SubclassMapper(typeof(Inherited), mapdoc);
+
+			mapper.Join("T1", x => { });
+			mapper.Join("T2", x => { });
+
+			var hbmClass = mapdoc.SubClasses[0];
+			hbmClass.Joins.Should().Have.Count.EqualTo(2);
+			hbmClass.Joins.Select(x => x.table).Should().Have.UniqueValues();
+		}
+
+		[Test]
+		public void WhenDefineMoreJoinsWithSameIdThenUseSameJoinMapperInstance()
+		{
+			var mapdoc = new HbmMapping();
+			var mapper = new SubclassMapper(typeof(Inherited), mapdoc);
+			IJoinMapper firstCallInstance = null;
+			IJoinMapper secondCallInstance = null;
+
+			mapper.Join("T1", x => firstCallInstance = x);
+			mapper.Join("T1", x => secondCallInstance = x);
+
+			firstCallInstance.Should().Be.SameInstanceAs(secondCallInstance);
+			var hbmClass = mapdoc.SubClasses[0];
+			hbmClass.Joins.Should().Have.Count.EqualTo(1);
+		}
+	}
+}
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2011-04-05 17:26:13 UTC (rev 5611)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2011-04-05 17:48:10 UTC (rev 5612)
@@ -528,6 +528,7 @@
     <Compile Include="MappingByCode\MappersTests\AbstractPropertyContainerMapperTest.cs" />
     <Compile Include="MappingByCode\MappersTests\ClassMapperWithJoinPropertiesTest.cs" />
     <Compile Include="MappingByCode\MappersTests\JoinMapperTests.cs" />
+    <Compile Include="MappingByCode\MappersTests\SubclassMapperWithJoinPropertiesTest.cs" />
     <Compile Include="MappingByCode\NatureDemo\Naturalness\Address.cs" />
     <Compile Include="MappingByCode\NatureDemo\Naturalness\Animal.cs" />
     <Compile Include="MappingByCode\NatureDemo\Naturalness\Classification.cs" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.