Merge pull request #407 from nhibernate/NH-1452

NH-1452 - Fix join's key column type

Author: hazzik

src/NHibernate/Mapping/PersistentClass.cs

@@ -4,6 +4,7 @@
 using NHibernate.SqlCommand;
 using NHibernate.Util;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace NHibernate.Mapping
 {
@@ -436,15 +437,7 @@ public virtual int JoinClosureSpan
 
 		public virtual int PropertyClosureSpan
 		{
-			get
-			{
-				int span = properties.Count;
-				foreach (Join join in joins)
-				{
-					span += join.PropertySpan;
-				}
-				return span;
-			}
+			get { return properties.Count + joins.Sum(j => j.PropertySpan); }
 		}
 
 		/// <summary> 

src/NHibernate/Persister/Entity/AbstractEntityPersister.cs

@@ -276,7 +276,7 @@ protected AbstractEntityPersister(PersistentClass persistentClass, ICacheConcurr
 				}
 			}
 
-			batchSize = persistentClass.BatchSize.HasValue ? persistentClass.BatchSize.Value : factory.Settings.DefaultBatchFetchSize;
+			batchSize = persistentClass.BatchSize ?? factory.Settings.DefaultBatchFetchSize;
 			hasSubselectLoadableCollections = persistentClass.HasSubselectLoadableCollections;
 
 			propertyMapping = new BasicEntityPropertyMapping(this);
@@ -993,6 +993,11 @@ public virtual string IdentifierPropertyName
 			get { return entityMetamodel.IdentifierProperty.Name; }
 		}
 
+		public virtual IType GetIdentifierType(int j)
+		{
+			return IdentifierType;
+		}
+
 		public virtual IType IdentifierType
 		{
 			get { return entityMetamodel.IdentifierProperty.Type; }
@@ -2241,9 +2246,9 @@ protected internal SqlCommandInfo GenerateUpdateString(bool[] includeProperty, i
 
 			// select the correct row by either pk or rowid
 			if (useRowId)
-				updateBuilder.SetIdentityColumn(new string[] { rowIdName }, NHibernateUtil.Int32); //TODO: eventually, rowIdName[j]
+				updateBuilder.SetIdentityColumn(new[] {rowIdName}, NHibernateUtil.Int32); //TODO: eventually, rowIdName[j]
 			else
-				updateBuilder.SetIdentityColumn(GetKeyColumns(j), IdentifierType);
+				updateBuilder.SetIdentityColumn(GetKeyColumns(j), GetIdentifierType(j));
 
 			bool hasColumns = false;
 			for (int i = 0; i < entityMetamodel.PropertySpan; i++)
@@ -2357,7 +2362,7 @@ protected virtual SqlCommandInfo GenerateInsertString(bool identityInsert, bool[
 			}
 			else
 			{
-				builder.AddColumns(GetKeyColumns(j), null, IdentifierType);
+				builder.AddColumns(GetKeyColumns(j), null, GetIdentifierType(j));
 			}
 
 			if (Factory.Settings.IsCommentsEnabled)
@@ -2407,7 +2412,7 @@ protected virtual SqlCommandInfo GenerateDeleteString(int j)
 			var deleteBuilder = new SqlDeleteBuilder(Factory.Dialect, Factory);
 			deleteBuilder
 				.SetTableName(GetTableName(j))
-				.SetIdentityColumn(GetKeyColumns(j), IdentifierType);
+				.SetIdentityColumn(GetKeyColumns(j), GetIdentifierType(j));
 
 			// NH: Only add version to where clause if optimistic lock mode is Version
 			if (j == 0 && IsVersioned && entityMetamodel.OptimisticLockMode == Versioning.OptimisticLock.Version)
@@ -3162,7 +3167,7 @@ protected SqlCommandInfo[] GenerateSQLDeleteStrings(object[] loadedState)
 			{
 				SqlDeleteBuilder delete = new SqlDeleteBuilder(Factory.Dialect, Factory)
 					.SetTableName(GetTableName(j))
-					.SetIdentityColumn(GetKeyColumns(j), IdentifierType);
+					.SetIdentityColumn(GetKeyColumns(j), GetIdentifierType(j));
 
 				if (Factory.Settings.IsCommentsEnabled)
 				{

src/NHibernate/Persister/Entity/SingleTableEntityPersister.cs

@@ -19,6 +19,7 @@ public class SingleTableEntityPersister : AbstractEntityPersister, IQueryable
 	{
 		// the class hierarchy structure
 		private readonly int joinSpan;
+		private IType[] identifierTypes;
 		private readonly string[] qualifiedTableNames;
 		private readonly bool[] isInverseTable;
 		private readonly bool[] isNullableTable;
@@ -39,7 +40,7 @@ public class SingleTableEntityPersister : AbstractEntityPersister, IQueryable
 		private readonly int[] propertyTableNumbers;
 
 		// if the id is a property of the base table eg join to property-ref
-		// if the id is not a property the value will be -1
+		// if the id is not a property the value will be null
 		private readonly Dictionary<int, int> tableIdPropertyNumbers;
 
 		// the closure of all columns used by the entire hierarchy including
@@ -82,13 +83,14 @@ public SingleTableEntityPersister(PersistentClass persistentClass, ICacheConcurr
 			#region CLASS + TABLE
 
 			joinSpan = persistentClass.JoinClosureSpan + 1;
+			identifierTypes = new IType[joinSpan];
 			qualifiedTableNames = new string[joinSpan];
 			isInverseTable = new bool[joinSpan];
 			isNullableTable = new bool[joinSpan];
 			keyColumnNames = new string[joinSpan][];
 			Table table = persistentClass.RootTable;
-			qualifiedTableNames[0] =
-				table.GetQualifiedName(factory.Dialect, factory.Settings.DefaultCatalogName, factory.Settings.DefaultSchemaName);
+			identifierTypes[0] = IdentifierType;
+			qualifiedTableNames[0] =table.GetQualifiedName(factory.Dialect, factory.Settings.DefaultCatalogName, factory.Settings.DefaultSchemaName);
 			isInverseTable[0] = false;
 			isNullableTable[0] = false;
 			keyColumnNames[0] = IdentifierColumnNames;
@@ -124,6 +126,7 @@ public SingleTableEntityPersister(PersistentClass persistentClass, ICacheConcurr
 			int j = 1;
 			foreach (Join join in persistentClass.JoinClosureIterator)
 			{
+				identifierTypes[j] = join.Key.Type;
 				qualifiedTableNames[j] = join.Table.GetQualifiedName(factory.Dialect, factory.Settings.DefaultCatalogName, factory.Settings.DefaultSchemaName);
 				isInverseTable[j] = join.IsInverse;
 				isNullableTable[j] = join.IsOptional;
@@ -461,6 +464,11 @@ public override string[] ConstraintOrderedTableNameClosure
 			get { return constraintOrderedTableNames; }
 		}
 
+		public override IType GetIdentifierType(int j)
+		{
+			return identifierTypes[j];
+		}
+
 		public override string[][] ContraintOrderedTableKeyColumnClosure
 		{
 			get { return constraintOrderedKeyColumnNames; }