NH-3559 - Add column names quoting in UnionSubclassEntityPersister

Author: whut

src/NHibernate.Test/NHibernate.Test.csproj

@@ -1198,6 +1198,9 @@
     <Compile Include="TypesTest\XDocTypeFixture.cs" />
     <Compile Include="TypesTest\XmlDocClass.cs" />
     <Compile Include="TypesTest\XmlDocTypeFixture.cs" />
+    <Compile Include="Unionsubclass\DatabaseKeyword.cs" />
+    <Compile Include="Unionsubclass\DatabaseKeywordBase.cs" />
+    <Compile Include="Unionsubclass\DatabaseKeywordsFixture.cs" />
     <Compile Include="UtilityTest\ArrayHelperTests.cs" />
     <Compile Include="UtilityTest\IdentitySetFixture.cs" />
     <Compile Include="UtilityTest\EnumerableExtensionsTests\AnyExtensionTests.cs" />
@@ -2993,6 +2996,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH3392\Mappings.hbm.xml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Unionsubclass\DatabaseKeyword.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2692\Mappings.hbm.xml">
       <SubType>Designer</SubType>
     </EmbeddedResource>

src/NHibernate.Test/Unionsubclass/DatabaseKeyword.cs

@@ -0,0 +1,34 @@
+namespace NHibernate.Test.Unionsubclass
+{
+	public class DatabaseKeyword : DatabaseKeywordBase
+	{
+		private string table;
+		private string create;
+		private string view;
+		private string user;
+
+		public virtual string Table
+		{
+			get { return table; }
+			set { table = value; }
+		}
+
+		public virtual string Create
+		{
+			get { return create; }
+			set { create = value; }
+		}
+
+		public virtual string View
+		{
+			get { return view; }
+			set { view = value; }
+		}
+
+		public virtual string User
+		{
+			get { return user; }
+			set { user = value; }
+		}
+	}
+}

src/NHibernate.Test/Unionsubclass/DatabaseKeyword.hbm.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test" namespace="NHibernate.Test.Unionsubclass" default-access="field">
+	<class name="DatabaseKeywordBase" abstract="true">
+
+		<id name="id" unsaved-value="0" column="id">
+			<generator class="hilo">
+				<param name="table">being_id</param>
+				<param name="column">next_id</param>
+			</generator>
+		</id>
+
+		<union-subclass name="DatabaseKeyword" table="databaseKeywords">
+			<property name="table" />
+			<property name="create" />
+			<property name="view" />
+			<property name="user" />
+		</union-subclass>
+	</class>
+
+</hibernate-mapping>

src/NHibernate.Test/Unionsubclass/DatabaseKeywordBase.cs

@@ -0,0 +1,13 @@
+namespace NHibernate.Test.Unionsubclass
+{
+	public abstract class DatabaseKeywordBase
+	{
+		private long id;
+
+		public virtual long Id
+		{
+			get { return id; }
+			set { id = value; }
+		}
+	}
+}

src/NHibernate.Test/Unionsubclass/DatabaseKeywordsFixture.cs

@@ -0,0 +1,47 @@
+using NHibernate.Cfg;
+using NUnit.Framework;
+using System.Collections;
+
+namespace NHibernate.Test.Unionsubclass
+{
+	[TestFixture]
+	public class DatabaseKeywordsFixture : TestCase
+	{
+		protected override string MappingsAssembly
+		{
+			get { return "NHibernate.Test"; }
+		}
+
+		protected override IList Mappings
+		{
+			get { return new string[] { "Unionsubclass.DatabaseKeyword.hbm.xml" }; }
+		}
+
+		protected override void Configure(Configuration configuration)
+		{
+			base.Configure(configuration);
+
+			configuration.SetProperty(Environment.Hbm2ddlKeyWords, "auto-quote");
+		}
+
+		[Test]
+		public void UnionSubClassQuotesReservedColumnNames()
+		{
+			using (ISession s = OpenSession())
+			using (ITransaction t = s.BeginTransaction())
+			{
+				s.Save(new DatabaseKeyword() { User = "user", View = "view", Table = "table", Create = "create" });
+
+				t.Commit();
+			}
+
+			using (ISession s = OpenSession())
+			using (ITransaction t = s.BeginTransaction())
+			{
+				s.Delete("from DatabaseKeywordBase");
+
+				t.Commit();
+			}
+		}
+	}
+}

src/NHibernate/Persister/Entity/UnionSubclassEntityPersister.cs

@@ -332,7 +332,7 @@ protected string GenerateSubquery(PersistentClass model, IMapping mapping)
 							var sqlType = col.GetSqlTypeCode(mapping);
 							buf.Append(dialect.GetSelectClauseNullString(sqlType)).Append(" as ");
 						}
-						buf.Append(col.Name);
+						buf.Append(col.GetQuotedName(dialect));
 						buf.Append(StringHelper.CommaSpace);
 					}
 					buf.Append(clazz.SubclassId).Append(" as clazz_");