Fix quoting <key /> columns containing reserved words

Fixes: #1100

Co-authored-by: Roman Artiukhin <bahusdrive@gmail.com>

Author: 2 people

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

@@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+// <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;
+using System.Linq;
+using NHibernate.Cfg;
+using NUnit.Framework;
+using NHibernate.Linq;
+
+namespace NHibernate.Test.NHSpecificTest.NH2892
+{
+	using System.Threading.Tasks;
+	[TestFixture]
+	public class FixtureAsync : BugTestCase
+	{
+		protected override void Configure(Configuration configuration)
+		{
+			configuration.SetProperty("hbm2ddl.keywords", "auto-quote");
+		}
+
+		protected override void OnSetUp()
+		{
+			using (ISession session = OpenSession())
+			{
+				var order = new Order();
+
+				session.Save(order);
+				session.Flush();
+
+				var orderLine = new OrderLine
+				{
+					Orders = order
+				};
+
+				session.Save(orderLine);
+				session.Flush();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (ISession session = OpenSession())
+			{
+				session.Delete($"from {nameof(OrderLine)}");
+				session.Delete($"from {nameof(Order)}");
+				session.Flush();
+			}
+		}
+
+		[Test]
+		public async Task SelectOrderLineFromOrderAsync()
+		{
+			using (ISession session = OpenSession())
+			{
+				var order = await (session.Query<Order>().FirstOrDefaultAsync());
+
+				Assert.That(order, Is.Not.Null);
+				Assert.DoesNotThrow(() => order.Elements.FirstOrDefault());
+				Assert.That(order.OrderLines, Is.Not.Null);
+				Assert.NotZero(order.OrderLines.Count);
+				Assert.NotZero(order.OrderLines.First().Id);
+			}
+		}
+	}
+}

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

@@ -0,0 +1,60 @@
+using System;
+using System.Linq;
+using NHibernate.Cfg;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH2892
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override void Configure(Configuration configuration)
+		{
+			configuration.SetProperty("hbm2ddl.keywords", "auto-quote");
+		}
+
+		protected override void OnSetUp()
+		{
+			using (ISession session = OpenSession())
+			{
+				var order = new Order();
+
+				session.Save(order);
+				session.Flush();
+
+				var orderLine = new OrderLine
+				{
+					Orders = order
+				};
+
+				session.Save(orderLine);
+				session.Flush();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (ISession session = OpenSession())
+			{
+				session.Delete($"from {nameof(OrderLine)}");
+				session.Delete($"from {nameof(Order)}");
+				session.Flush();
+			}
+		}
+
+		[Test]
+		public void SelectOrderLineFromOrder()
+		{
+			using (ISession session = OpenSession())
+			{
+				var order = session.Query<Order>().FirstOrDefault();
+
+				Assert.That(order, Is.Not.Null);
+				Assert.DoesNotThrow(() => order.Elements.FirstOrDefault());
+				Assert.That(order.OrderLines, Is.Not.Null);
+				Assert.NotZero(order.OrderLines.Count);
+				Assert.NotZero(order.OrderLines.First().Id);
+			}
+		}
+	}
+}

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH2892">
+    <class name="Order" table="Order" lazy="false">
+        <id name="Id" column="id">
+            <generator class="native"/>
+        </id>
+        <set name="OrderLines" table="OrderOrderLine" inverse="true" cascade="all-delete-orphan">
+            <key column="Order"/>
+            <one-to-many class="OrderLine"/>
+        </set>
+        <bag name="Elements" cascade="none">
+          <key column="id"/>
+          <element column="Order" type="int"/>
+        </bag>
+    </class>
+    <class name="OrderLine" table="OrderOrderLine" lazy="false">
+        <id name="Id" column="id">
+            <generator class="native"/>
+        </id>
+        <many-to-one name="Orders" column="Order" not-null="true"/>
+    </class>
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH2892/Order.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH2892
+{
+	public class Order
+	{
+		public virtual int Id { get; set; }
+		public virtual ISet<OrderLine> OrderLines { get; set; } = new HashSet<OrderLine>();
+		public virtual IList<int> Elements { get; set; } = new List<int>();
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH2892/OrderLine.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH2892
+{
+	public class OrderLine
+	{
+		public virtual int Id { get; set; }
+		public virtual Order Orders { get; set; }
+	}
+}

src/NHibernate/Async/Tool/hbm2ddl/SchemaMetadataUpdater.cs

@@ -13,6 +13,7 @@
 using NHibernate.Engine;
 using NHibernate.Mapping;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace NHibernate.Tool.hbm2ddl
 {

src/NHibernate/Tool/hbm2ddl/SchemaMetadataUpdater.cs

@@ -3,6 +3,7 @@
 using NHibernate.Engine;
 using NHibernate.Mapping;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace NHibernate.Tool.hbm2ddl
 {
@@ -61,6 +62,8 @@ public static void QuoteTableAndColumns(Configuration configuration, Dialect.Dia
 			foreach (var cm in configuration.CollectionMappings)
 			{
 				QuoteTable(cm.Table, dialect);
+				QuoteColumns(cm.Key, dialect);
+				QuoteColumns(cm.Element, dialect);
 			}
 		}
 
@@ -70,7 +73,20 @@ private static void QuoteTable(Table table, Dialect.Dialect dialect)
 			{
 				table.IsQuoted = true;
 			}
-			foreach (var column in table.ColumnIterator)
+
+			QuoteColumns(table.ColumnIterator, dialect);
+		}
+
+		private static void QuoteColumns(IValue value, Dialect.Dialect dialect)
+		{
+			if (value == null)
+				return;
+			QuoteColumns(value.ColumnIterator.OfType<Column>(), dialect);
+		}
+
+		private static void QuoteColumns(IEnumerable<Column> columns, Dialect.Dialect dialect)
+		{
+			foreach (var column in columns)
 			{
 				if (!column.IsQuoted && dialect.IsKeyword(column.Name))
 				{