NH-742 test and fix. Renamed a few methods in persister hierarchy.

SVN: trunk@2357

Author: Sergey Koshcheyev

src/NHibernate.DomainModel/CustomPersister.cs

@@ -354,7 +354,7 @@ public void Lock(object id, object version, object obj, LockMode lockMode, ISess
 		/// <param name="version"></param>
 		/// <param name="session"></param>
 		/// <returns></returns>
-		public object[] GetCurrentPersistentState( object id, object version, ISessionImplementor session )
+		public object[] GetDatabaseSnapshot( object id, object version, ISessionImplementor session )
 		{
 			return null;
 		}

src/NHibernate.Test/NHSpecificTest/EntityKeyFixture.cs

@@ -203,7 +203,7 @@ public NHibernate.Type.IType[] PropertyTypes
 			}
 		}
 
-		public object[] GetCurrentPersistentState(object id, object version, ISessionImplementor session)
+		public object[] GetDatabaseSnapshot(object id, object version, ISessionImplementor session)
 		{
 			// TODO:  Add TestingClassPersister.GetCurrentPersistentState implementation
 			return null;

src/NHibernate.Test/NHSpecificTest/NH742/Classes.cs

@@ -0,0 +1,40 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH742
+{
+	public class Point
+	{
+		int x, y;
+		
+		public int X
+		{
+			get { return x; }
+			set { x = value; }
+		}
+		
+		public int Y
+		{
+			get { return y; }
+			set { y = value; }
+		}
+	}
+
+	public class SomeClass
+	{
+		private int id;
+		private Point point;
+
+		public virtual int Id
+		{
+			get { return id; }
+			set { id = value; }
+		}
+
+		public virtual Point Point
+		{
+			get { return point; }
+			set { point = value; }
+		}
+	}
+
+}

src/NHibernate.Test/NHSpecificTest/NH742/Fixture.cs

@@ -0,0 +1,15 @@
+using System;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH742
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		[Test]
+		public void Bug()
+		{
+			// Do nothing, we only want to check the configuration
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH742/Mappings.hbm.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"
+				   assembly="NHibernate.Test"
+				   namespace="NHibernate.Test.NHSpecificTest.NH742">
+	<class name="SomeClass">
+		<id name="Id">
+			<generator class="increment" />
+		</id>
+		<component name="Point">
+			<property name="X" formula="10" />
+			<property name="Y" formula="20" />
+		</component>
+	</class>
+</hibernate-mapping>

src/NHibernate.Test/NHibernate.Test-2.0.csproj

@@ -325,6 +325,8 @@
     <Compile Include="NHSpecificTest\NH555\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH739\Cat.cs" />
     <Compile Include="NHSpecificTest\NH739\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH742\Classes.cs" />
+    <Compile Include="NHSpecificTest\NH742\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH750\Device.cs" />
     <Compile Include="NHSpecificTest\NH750\Drive.cs" />
     <Compile Include="NHSpecificTest\NH750\Fixture.cs" />
@@ -678,6 +680,9 @@
   <ItemGroup>
     <EmbeddedResource Include="NHSpecificTest\NH706\Mappings.hbm.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH742\Mappings.hbm.xml" />
+  </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>

src/NHibernate/Impl/SessionImpl.cs

@@ -3378,7 +3378,7 @@ private void FlushEntity(object obj, EntityEntry entry)
 				}
 				else
 				{
-					currentPersistentState = persister.GetCurrentPersistentState(entry.Id, entry.Version, this);
+					currentPersistentState = persister.GetDatabaseSnapshot(entry.Id, entry.Version, this);
 					if (currentPersistentState != null)
 					{
 						dirtyProperties = persister.FindModified(currentPersistentState, values, obj, this);

src/NHibernate/Mapping/SimpleValue.cs

@@ -71,10 +71,14 @@ public virtual IType Type
 				this.type = value;
 				int count = 0;
 
-				foreach( Column col in ColumnCollection )
+				foreach( ISelectable sel in ColumnCollection )
 				{
-					col.Type = type;
-					col.TypeIndex = count++;
+					if (sel is Column)
+					{
+						Column col = (Column) sel;
+						col.Type = type;
+						col.TypeIndex = count++;
+					}
 				}
 			}
 		}

src/NHibernate/Persister/Entity/AbstractEntityPersister.cs

@@ -157,7 +157,7 @@ public abstract class AbstractEntityPersister : AbstractPropertyMapping, IOuterJ
 		private SqlCommandInfo[] sqlInsertStrings;
 		private SqlCommandInfo sqlIdentityInsertString;
 		private SqlCommandInfo[] sqlUpdateStrings;
-		private SqlString sqlConcreteSelectString;
+		private SqlString sqlSnapshotSelectString;
 		private SqlString sqlVersionSelectString;
 		private bool[] tableHasColumns;
 
@@ -1503,7 +1503,7 @@ protected object GetGeneratedIdentity(object obj, ISessionImplementor session, I
 			return id;
 		}
 
-		public object[] GetCurrentPersistentState(object id, object version, ISessionImplementor session)
+		public object[] GetDatabaseSnapshot(object id, object version, ISessionImplementor session)
 		{
 			if (!HasSelectBeforeUpdate)
 			{
@@ -1518,7 +1518,7 @@ public object[] GetCurrentPersistentState(object id, object version, ISessionImp
 			IType[] types = PropertyTypes;
 			object[] values = new object[types.Length];
 			bool[] includeProperty = PropertyUpdateability;
-			SqlString sql = ConcreteSelectString;
+			SqlString sql = SQLSnapshotSelectString;
 			try
 			{
 				IDbCommand st = session.Batcher.PrepareCommand(CommandType.Text, sql, idAndVersionSqlTypes);
@@ -1639,6 +1639,11 @@ protected int GetPropertyColumnSpan(int i)
 		{
 			return propertyColumnSpans[i];
 		}
+		
+		protected string[] GetPropertyColumnFormulaTemplates(int i)
+		{
+			return propertyColumnFormulaTemplates[i];
+		}
 
 		public string SelectFragment(string alias, string suffix, bool includeCollectionColumns)
 		{
@@ -2229,6 +2234,11 @@ protected EntityMetamodel EntityMetamodel
 			get { return entityMetamodel; }
 		}
 
+		private string RootAlias
+		{
+			get { return StringHelper.GenerateAlias(ClassName); }
+		}
+
 		protected void PostConstruct(IMapping mapping)
 		{
 			InitPropertyPaths(mapping);
@@ -2239,7 +2249,73 @@ protected void PostConstruct(IMapping mapping)
 			idSqlTypes = IdentifierType.SqlTypes(mapping);
 		}
 
-		protected abstract SqlString GenerateConcreteSelectString();
+		protected abstract int[] PropertyTableNumbersInSelect { get; }
+
+		protected string ConcretePropertySelectFragment(string alias, bool[] includeProperty)
+		{
+			int propertyCount = entityMetamodel.PropertySpan;
+			int[] propertyTableNumbers = PropertyTableNumbersInSelect;
+			SelectFragment frag = new SelectFragment(Factory.Dialect);
+			for (int i = 0; i < propertyCount; i++)
+			{
+				if (includeProperty[i])
+				{
+					//ie. updateable, not a formula
+					frag.AddColumns(
+						GenerateTableAlias(alias, propertyTableNumbers[i]),
+						propertyColumnNames[i],
+						propertyColumnAliases[i]
+						);
+					frag.AddFormulas(
+						GenerateTableAlias(alias, propertyTableNumbers[i]),
+						propertyColumnFormulaTemplates[i],
+						propertyColumnAliases[i]
+						);
+				}
+			}
+			return frag.ToSqlStringFragment();
+		}
+
+		protected virtual SqlString GenerateSnapshotSelectString()
+		{
+			//TODO: should we use SELECT .. FOR UPDATE?
+
+			SqlSelectBuilder select = new SqlSelectBuilder(Factory);
+
+			//if (Factory.Settings.IsCommentsEnabled)
+			//{
+			//    select.SetComment("get current state " + ClassName);
+			//}
+
+			string[] aliasedIdColumns = StringHelper.Qualify(RootAlias, IdentifierColumnNames);
+			string selectClause = StringHelper.Join(", ", aliasedIdColumns) +
+			                      ConcretePropertySelectFragment(RootAlias, PropertyUpdateability);
+
+			SqlString fromClause = FromTableFragment(RootAlias) +
+			                       FromJoinFragment(RootAlias, true, false);
+
+			SqlString joiner = new SqlString("=", Parameter.Placeholder, " and ");
+			SqlString whereClause = new SqlStringBuilder()
+				.Add(StringHelper.Join(joiner, aliasedIdColumns))
+				.Add("=")
+				.AddParameter()
+				.Add(WhereJoinFragment(RootAlias, true, false))
+				.ToSqlString();
+
+			// TODO H3: this is commented out in H3.2
+			if (IsVersioned)
+			{
+				whereClause.Append(" and ")
+					.Append(VersionColumnName)
+					.Append("=?");
+			}
+
+			return select.SetSelectClause(selectClause)
+				.SetFromClause(fromClause)
+				.SetOuterJoins(SqlString.Empty, SqlString.Empty)
+				.SetWhereClause(whereClause)
+				.ToSqlString();
+		}
 
 		public virtual void PostInstantiate()
 		{
@@ -2269,7 +2345,7 @@ public virtual void PostInstantiate()
 			                          	? GenerateIdentityInsertString(PropertyInsertability)
 			                          	: null;
 
-			sqlConcreteSelectString = GenerateConcreteSelectString();
+			sqlSnapshotSelectString = GenerateSnapshotSelectString();
 			sqlVersionSelectString = GenerateSelectVersionString();
 
 			// This is used to determine updates for objects that came in via update()
@@ -2818,9 +2894,9 @@ protected SqlString VersionSelectString
 			get { return sqlVersionSelectString; }
 		}
 
-		protected SqlString ConcreteSelectString
+		protected SqlString SQLSnapshotSelectString
 		{
-			get { return sqlConcreteSelectString; }
+			get { return sqlSnapshotSelectString; }
 		}
 
 		protected SqlCommandInfo GenerateDeleteString(int j)

src/NHibernate/Persister/Entity/IEntityPersister.cs

@@ -391,7 +391,7 @@ public interface IEntityPersister
 		/// <param name="version"></param>
 		/// <param name="session"></param>
 		/// <returns><c>null</c> if select-before-update is not enabled or not supported</returns>
-		object[] GetCurrentPersistentState( object id, object version, ISessionImplementor session );
+		object[] GetDatabaseSnapshot( object id, object version, ISessionImplementor session );
 
 		/// <summary>
 		/// Get the current version of the object, or return null if there is no row for

src/NHibernate/Persister/Entity/JoinedSubclassEntityPersister.cs

@@ -209,7 +209,7 @@ protected override SqlString GenerateLockString(SqlString sqlString, string forU
 
 		private const string ConcreteAlias = "x";
 
-		protected override SqlString GenerateConcreteSelectString()
+		protected override SqlString GenerateSnapshotSelectString()
 		{
 			SqlStringBuilder select = new SqlStringBuilder();
 
@@ -673,23 +673,9 @@ public override string[] ToColumns(string alias, string property)
 			}
 		}
 
-		protected string ConcretePropertySelectFragment(string alias, bool[] includeProperty)
+		protected override int[] PropertyTableNumbersInSelect
 		{
-			int propertyCount = PropertyNames.Length;
-			SelectFragment frag = new SelectFragment(Dialect);
-
-			for (int i = 0; i < propertyCount; i++)
-			{
-				if (includeProperty[i])
-				{
-					frag.AddColumns(
-						Alias(alias, propertyTables[i]),
-						GetPropertyColumnNames(i),
-						GetPropertyColumnAliases(i));
-				}
-			}
-
-			return frag.ToSqlStringFragment();
+			get { return propertyTables; }
 		}
 
 		private CaseFragment DiscriminatorFragment(string alias)

src/NHibernate/Persister/Entity/SingleTableEntityPersister.cs

@@ -194,32 +194,9 @@ protected virtual SqlString GenerateSelectString(string forUpdateFragment)
 			return selectSqlString;
 		}
 
-		/// <summary>
-		/// Generate the SQL that selects a row by id, excluding subclasses
-		/// </summary>
-		protected override SqlString GenerateConcreteSelectString()
+		protected override int[] PropertyTableNumbersInSelect
 		{
-			SqlSimpleSelectBuilder builder = new SqlSimpleSelectBuilder(Factory);
-
-			// set the table and the identity columns
-			builder.SetTableName(TableName)
-				.AddColumns(IdentifierColumnNames);
-
-			for (int i = 0; i < PropertyNames.Length; i++)
-			{
-				if (PropertyUpdateability[i])
-				{
-					builder.AddColumns(GetPropertyColumnNames(i), GetPropertyColumnAliases(i));
-				}
-			}
-
-			builder.SetIdentityColumn(IdentifierColumnNames, IdentifierType);
-			if (IsVersioned)
-			{
-				builder.SetVersionColumn(new string[] {VersionColumnName}, VersionType);
-			}
-
-			return builder.ToSqlString();
+			get { return propertyTableNumbers; }
 		}
 
 		/// <summary>

src/NHibernate/SqlCommand/SqlString.cs

@@ -37,7 +37,7 @@ public SqlString(string sqlPart)
 			}
 		}
 
-		public SqlString(object[] sqlParts)
+		public SqlString(params object[] sqlParts)
 		{
 #if DEBUG
 			foreach (object obj in sqlParts)