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

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

Revision: 5607
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5607&view=rev
Author:   fabiomaulo
Date:     2011-04-04 19:47:46 +0000 (Mon, 04 Apr 2011)

Log Message:
-----------
ClassMapper with Joins

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

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

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IClassMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/IClassMapper.cs	2011-04-04 18:28:31 UTC (rev 5606)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/IClassMapper.cs	2011-04-04 19:47:46 UTC (rev 5607)
@@ -24,7 +24,7 @@
 
 	public interface IClassMapper : IClassAttributesMapper, IPropertyContainerMapper
 	{
-		void Join(Action<IJoinMapper> splittedMapping);
+		void Join(string tableName, Action<IJoinMapper> splittedMapping);
 	}
 
 	public interface IClassAttributesMapper<TEntity> : IEntityAttributesMapper, IEntitySqlsMapper where TEntity : class

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs	2011-04-04 18:28:31 UTC (rev 5606)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs	2011-04-04 19:47:46 UTC (rev 5607)
@@ -11,6 +11,7 @@
 	{
 		private readonly HbmClass classMapping;
 		private readonly IIdMapper idMapper;
+		private Dictionary<string, IJoinMapper> joinMappers;
 		private ICacheMapper cacheMapper;
 		private IDiscriminatorMapper discriminatorMapper;
 		private INaturalIdMapper naturalIdMapper;
@@ -49,6 +50,11 @@
 
 		#endregion
 
+		private Dictionary<string, IJoinMapper> JoinMappers
+		{
+			get { return joinMappers ?? (joinMappers = new Dictionary<string, IJoinMapper>()); }
+		}
+
 		#region Implementation of IClassMapper
 
 		public void Id(Action<IIdMapper> mapper)
@@ -168,9 +174,19 @@
 			classMapping.schemaaction = action.ToSchemaActionString();
 		}
 
-		public void Join(Action<IJoinMapper> splittedMapping)
+		public void Join(string tableName, Action<IJoinMapper> splittedMapping)
 		{
-			throw new NotImplementedException();
+			IJoinMapper splitGroup;
+			if(!JoinMappers.TryGetValue(tableName, out splitGroup))
+			{
+				var hbmJoin = new HbmJoin();
+				splitGroup = new JoinMapper(Container, tableName, hbmJoin, MapDoc);
+				var toAdd = new[] { hbmJoin };
+				JoinMappers.Add(tableName, splitGroup);
+				classMapping.Items1 = classMapping.Items1 == null ? toAdd : classMapping.Items1.Concat(toAdd).ToArray();
+			}
+
+			splittedMapping(splitGroup);
 		}
 
 		#endregion

Added: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/ClassMapperWithJoinPropertiesTest.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/ClassMapperWithJoinPropertiesTest.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/ClassMapperWithJoinPropertiesTest.cs	2011-04-04 19:47:46 UTC (rev 5607)
@@ -0,0 +1,89 @@
+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 ClassMapperWithJoinPropertiesTest
+	{
+		private class MyClass
+		{
+			public int Id { get; set; }
+		}
+
+		[Test]
+		public void WhenDefineJoinThenAddJoinWithTableNameAndKey()
+		{
+			var mapdoc = new HbmMapping();
+			var mapper = new ClassMapper(typeof(MyClass), mapdoc, For<MyClass>.Property(x=> x.Id));
+			mapper.Join("MyTable",x => { });
+
+			var hbmClass = mapdoc.RootClasses[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 ClassMapper(typeof(MyClass), mapdoc, For<MyClass>.Property(x => x.Id));
+			var called = false;
+			mapper.Join("MyTable", x =>
+			            {
+										x.Should().Not.Be.Null();
+										called = true;
+			            });
+
+			called.Should().Be.True();
+		}
+
+		//[Test]
+		//public void WhenDefineJoinTableNameAsTableOfRootThenThrows()
+		//{
+		// We can't give support to this check.
+		// The name of the table of the root-class may change during the mapping process where the name of the joined table is immutable (or...perhaps what is really immutable is the Id used in the explicit mapping ;) )
+		// We are using the name of the joined table as id for the splitted property group. I can't find another way to be 100% sure to re-use the same
+		// instance of JoinMapper when the Join method is used more than once.
+		// The case of "inconsistent" name should be checked by binders since the problem is the same using XML mappings
+		//
+		//  var mapdoc = new HbmMapping();
+		//  var mapper = new ClassMapper(typeof(MyClass), mapdoc, For<MyClass>.Property(x => x.Id));
+		//  Executing.This(()=> mapper.Join("MyClass", x => { })).Should().Throw<MappingException>();
+		//}
+
+		[Test]
+		public void WhenDefineMoreJoinsThenTableNameShouldBeUnique()
+		{
+			var mapdoc = new HbmMapping();
+			var mapper = new ClassMapper(typeof(MyClass), mapdoc, For<MyClass>.Property(x => x.Id));
+			mapper.Join("T1", x => { });
+			mapper.Join("T2",x => { });
+
+			var hbmClass = mapdoc.RootClasses[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 ClassMapper(typeof(MyClass), mapdoc, For<MyClass>.Property(x => x.Id));
+			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.RootClasses[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-04 18:28:31 UTC (rev 5606)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2011-04-04 19:47:46 UTC (rev 5607)
@@ -523,6 +523,7 @@
     <Compile Include="MappingByCode\ExpliticMappingTests\VersionTests.cs" />
     <Compile Include="MappingByCode\For.cs" />
     <Compile Include="MappingByCode\MappersTests\AbstractPropertyContainerMapperTest.cs" />
+    <Compile Include="MappingByCode\MappersTests\ClassMapperWithJoinPropertiesTest.cs" />
     <Compile Include="MappingByCode\MappersTests\JoinMapperTests.cs" />
     <Compile Include="MappingByCode\NatureDemo\Naturalness\Address.cs" />
     <Compile Include="MappingByCode\NatureDemo\Naturalness\Animal.cs" />


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