Fix generation of version update statement for joined subclasses

Tests contributed by @lowds

Fixes #1269

Author: hazzik

src/NHibernate.Test/Async/NHSpecificTest/NH3069/Fixture.cs

@@ -0,0 +1,57 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System.Linq;
+using NUnit.Framework;
+using NHibernate.Linq;
+
+namespace NHibernate.Test.NHSpecificTest.NH3069
+{
+	using System.Threading.Tasks;
+	[TestFixture]
+	public class FixtureAsync : BugTestCase
+	{
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var tx = session.BeginTransaction())
+			{
+				var entity = new VersionableConcreate { Name = "Some Name" };
+				session.Save(entity);
+
+				tx.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var tx = session.BeginTransaction())
+			{
+				session.Delete("from VersionableAbstract");
+				tx.Commit();
+			}
+		}
+
+		[Test]
+		public async Task ShouldLockEntityAsync()
+		{
+			using (var session = OpenSession())
+			using (var tx = session.BeginTransaction())
+			{
+				var entity = await (session.Query<VersionableConcreate>().SingleAsync());
+				await (session.LockAsync(
+					entity,
+					LockMode.Force)); //exception is thrown here when incorrect update statement is generated
+				await (tx.CommitAsync());
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3069/Domain.cs

@@ -0,0 +1,13 @@
+namespace NHibernate.Test.NHSpecificTest.NH3069
+{
+	public abstract class VersionableAbstract
+	{
+		public long Id { get; set; }
+		public int Version { get; set; }
+	}
+
+	public class VersionableConcreate : VersionableAbstract
+	{
+		public string Name { get; set; }
+	}
+}

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

@@ -0,0 +1,45 @@
+using System.Linq;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3069
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var tx = session.BeginTransaction())
+			{
+				var entity = new VersionableConcreate { Name = "Some Name" };
+				session.Save(entity);
+
+				tx.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var tx = session.BeginTransaction())
+			{
+				session.Delete("from VersionableAbstract");
+				tx.Commit();
+			}
+		}
+
+		[Test]
+		public void ShouldLockEntity()
+		{
+			using (var session = OpenSession())
+			using (var tx = session.BeginTransaction())
+			{
+				var entity = session.Query<VersionableConcreate>().Single();
+				session.Lock(
+					entity,
+					LockMode.Force); //exception is thrown here when incorrect update statement is generated
+				tx.Commit();
+			}
+		}
+	}
+}

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+                   assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH3069"
+                   default-lazy="false">
+  <class name="VersionableAbstract">
+    <id name="Id" column="`id`" generator="identity"/>
+    <version name="Version" column="`version`"/>
+
+    <joined-subclass name="VersionableConcreate">
+      <key column="`VersionableAbstract_id`"/>
+      <property name="Name" column="`name`"/>
+    </joined-subclass>
+  </class>
+</hibernate-mapping>

src/NHibernate/Persister/Entity/AbstractEntityPersister.cs

@@ -683,6 +683,7 @@ public virtual string VersionColumnName
 			get { return versionColumnName; }
 		}
 
+		[Obsolete("Please use RootTableName instead.")]
 		protected internal string VersionedTableName
 		{
 			get { return GetTableName(0); }
@@ -1540,20 +1541,20 @@ public object[] GetDatabaseSnapshot(object id, ISessionImplementor session)
 		/// </summary>
 		protected SqlString GenerateSelectVersionString()
 		{
-			SqlSimpleSelectBuilder builder = new SqlSimpleSelectBuilder(Factory.Dialect, factory)
-				.SetTableName(VersionedTableName);
+			SqlSimpleSelectBuilder builder = new SqlSimpleSelectBuilder(Factory.Dialect, Factory)
+				.SetTableName(RootTableName);
 
 			if (IsVersioned)
-				builder.AddColumn(versionColumnName);
+				builder.AddColumn(VersionColumnName);
 			else
-				builder.AddColumns(rootTableKeyColumnNames);
+				builder.AddColumns(RootTableIdentifierColumnNames);
 
 			if (Factory.Settings.IsCommentsEnabled)
 			{
 				builder.SetComment("get version " + EntityName);
 			}
 
-			return builder.AddWhereFragment(rootTableKeyColumnNames, IdentifierType, " = ").ToSqlString();
+			return builder.AddWhereFragment(RootTableIdentifierColumnNames, IdentifierType, " = ").ToSqlString();
 		}
 
 		protected SqlString GenerateInsertGeneratedValuesSelectString()
@@ -1722,13 +1723,13 @@ public object ForceVersionIncrement(object id, object currentVersion, ISessionIm
 		private SqlCommandInfo GenerateVersionIncrementUpdateString()
 		{
 			SqlUpdateBuilder update = new SqlUpdateBuilder(Factory.Dialect, Factory);
-			update.SetTableName(GetTableName(0));
+			update.SetTableName(RootTableName);
 			if (Factory.Settings.IsCommentsEnabled)
 			{
 				update.SetComment("forced version increment");
 			}
 			update.AddColumn(VersionColumnName, VersionType);
-			update.SetIdentityColumn(IdentifierColumnNames, IdentifierType);
+			update.SetIdentityColumn(RootTableIdentifierColumnNames, IdentifierType);
 			update.SetVersionColumn(new string[] { VersionColumnName }, VersionType);
 			return update.ToSqlCommandInfo();
 		}