NH-4043 - Use Dialect.Keywords for auto-quoting.

settings.IsKeywordsImportEnabled was supposed to import from the driver,
not settings.IsAutoQuoteEnabled.

Author: ngbrown

src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs

@@ -157,7 +157,8 @@ public void ExplicitAutoQuote()
 			configuration.AddResource("NHibernate.Test.Tools.hbm2ddl.SchemaMetadataUpdaterTest.HeavyEntity.hbm.xml",
 																GetType().Assembly);
 
-			SchemaMetadataUpdater.QuoteTableAndColumns(configuration);
+			var dialect = Dialect.Dialect.GetDialect(configuration.GetDerivedProperties());
+			SchemaMetadataUpdater.QuoteTableAndColumns(configuration, dialect);
 
 			var cm = configuration.GetClassMapping(typeof(Order));
 			Assert.That(cm.Table.IsQuoted);
@@ -258,7 +259,8 @@ public void WhenConfiguredOnlyExplicitAutoQuote()
 			configuration.AddResource("NHibernate.Test.Tools.hbm2ddl.SchemaMetadataUpdaterTest.HeavyEntity.hbm.xml",
 																GetType().Assembly);
 
-			SchemaMetadataUpdater.QuoteTableAndColumns(configuration);
+			var dialect = Dialect.Dialect.GetDialect(configuration.GetDerivedProperties());
+			SchemaMetadataUpdater.QuoteTableAndColumns(configuration, dialect);
 
 			var cm = configuration.GetClassMapping(typeof(Order));
 			Assert.That(cm.Table.IsQuoted);

src/NHibernate/Impl/SessionFactoryImpl.cs

@@ -201,7 +201,7 @@ public SessionFactoryImpl(Configuration cfg, IMapping mapping, Settings settings
 				}
 				if (settings.IsAutoQuoteEnabled)
 				{
-					SchemaMetadataUpdater.QuoteTableAndColumns(cfg);
+					SchemaMetadataUpdater.QuoteTableAndColumns(cfg, this.Dialect);
 				}
 			}
 			catch (NotSupportedException)

src/NHibernate/Tool/hbm2ddl/SchemaExport.cs

@@ -56,14 +56,16 @@ private void Initialize()
 			{
 				return;
 			}
+			dialect = Dialect.Dialect.GetDialect(configProperties);
+
 			string autoKeyWordsImport = PropertiesHelper.GetString(Environment.Hbm2ddlKeyWords, configProperties, "not-defined");
 			autoKeyWordsImport = autoKeyWordsImport.ToLowerInvariant();
 			if (autoKeyWordsImport == Hbm2DDLKeyWords.AutoQuote)
 			{
-				SchemaMetadataUpdater.QuoteTableAndColumns(cfg);
+				SchemaMetadataUpdater.Update(cfg, dialect);
+				SchemaMetadataUpdater.QuoteTableAndColumns(cfg, dialect);
 			}
 
-			dialect = Dialect.Dialect.GetDialect(configProperties);
 			dropSQL = cfg.GenerateDropSchemaScript(dialect);
 			createSQL = cfg.GenerateSchemaCreationScript(dialect);
 			formatter = (PropertiesHelper.GetBoolean(Environment.FormatSql, configProperties, true) ? FormatStyle.Ddl : FormatStyle.None).Formatter;

src/NHibernate/Tool/hbm2ddl/SchemaMetadataUpdater.cs

@@ -1,24 +1,39 @@
+using System;
 using NHibernate.Cfg;
 using NHibernate.Engine;
 using NHibernate.Mapping;
 using System.Collections.Generic;
+using NHibernate.Connection;
 
 namespace NHibernate.Tool.hbm2ddl
 {
 	// Candidate to be exstensions of ISessionFactory and Configuration
 	public static class SchemaMetadataUpdater
 	{
-		public static void Update(ISessionFactory sessionFactory)
+		public static void Update(ISessionFactoryImplementor sessionFactory)
 		{
-			var factory = (ISessionFactoryImplementor) sessionFactory;
-			var dialect = factory.Dialect;
-			var connectionHelper = new SuppliedConnectionProviderConnectionHelper(factory.ConnectionProvider);
-			factory.Dialect.Keywords.UnionWith(GetReservedWords(dialect, connectionHelper));
+			var reservedWords = GetReservedWords(sessionFactory.ConnectionProvider, sessionFactory.Dialect);
+			sessionFactory.Dialect.Keywords.UnionWith(reservedWords);
 		}
 
+		public static void Update(Configuration configuration, Dialect.Dialect dialect)
+		{
+			dialect.Keywords.UnionWith(GetReservedWords(configuration, dialect));
+		}
+
+		[Obsolete("Use the overload that passes dialect so keywords will be updated and persisted before auto-quoting")]
 		public static void QuoteTableAndColumns(Configuration configuration)
 		{
-			ISet<string> reservedDb = GetReservedWords(configuration.GetDerivedProperties());
+			// Instantiates a new instance of the dialect so doesn't benefit from the Update call.
+			var dialect = Dialect.Dialect.GetDialect(configuration.GetDerivedProperties());
+			Update(configuration, dialect);
+			QuoteTableAndColumns(configuration, dialect);
+		}
+
+		public static void QuoteTableAndColumns(Configuration configuration, Dialect.Dialect dialect)
+		{
+			ISet<string> reservedDb = dialect.Keywords;
+
 			foreach (var cm in configuration.ClassMappings)
 			{
 				QuoteTable(cm.Table, reservedDb);
@@ -29,30 +44,43 @@ public static void QuoteTableAndColumns(Configuration configuration)
 			}
 		}
 
-		private static ISet<string> GetReservedWords(IDictionary<string, string> cfgProperties)
+		private static ISet<string> GetReservedWords(Configuration configuration, Dialect.Dialect dialect)
 		{
-			var dialect = Dialect.Dialect.GetDialect(cfgProperties);
-			var connectionHelper = new ManagedProviderConnectionHelper(cfgProperties);
-			return GetReservedWords(dialect, connectionHelper);
+			IConnectionHelper connectionHelper = new ManagedProviderConnectionHelper(configuration.GetDerivedProperties());
+			connectionHelper.Prepare();
+			try
+			{
+				return GetReservedWords(dialect, connectionHelper);
+			}
+			finally
+			{
+				connectionHelper.Release();
+			}
 		}
 
-		private static ISet<string> GetReservedWords(Dialect.Dialect dialect, IConnectionHelper connectionHelper)
+		private static ISet<string> GetReservedWords(IConnectionProvider connectionProvider, Dialect.Dialect dialect)
 		{
-			ISet<string> reservedDb = new HashSet<string>();
+			IConnectionHelper connectionHelper = new SuppliedConnectionProviderConnectionHelper(connectionProvider);
 			connectionHelper.Prepare();
 			try
 			{
-				var metaData = dialect.GetDataBaseSchema(connectionHelper.Connection);
-				foreach (var rw in metaData.GetReservedWords())
-				{
-					reservedDb.Add(rw.ToLowerInvariant());
-				}
+				return GetReservedWords(dialect, connectionHelper);
 			}
 			finally
 			{
 				connectionHelper.Release();
 			}
-			return reservedDb;
+		}
+
+		private static ISet<string> GetReservedWords(Dialect.Dialect dialect, IConnectionHelper connectionHelper)
+		{
+			ISet<string> reservedWords = new HashSet<string>(dialect.Keywords);
+			var metaData = dialect.GetDataBaseSchema(connectionHelper.Connection);
+			foreach (var rw in metaData.GetReservedWords())
+			{
+				reservedWords.Add(rw.ToLowerInvariant());
+			}
+			return reservedWords;
 		}
 
 		private static void QuoteTable(Table table, ICollection<string> reservedDb)

src/NHibernate/Tool/hbm2ddl/SchemaUpdate.cs

@@ -141,7 +141,8 @@ public void Execute(Action<string> scriptAction, bool doUpdate)
 			autoKeyWordsImport = autoKeyWordsImport.ToLowerInvariant();
 			if (autoKeyWordsImport == Hbm2DDLKeyWords.AutoQuote)
 			{
-				SchemaMetadataUpdater.QuoteTableAndColumns(configuration);
+				SchemaMetadataUpdater.Update(configuration, dialect);
+				SchemaMetadataUpdater.QuoteTableAndColumns(configuration, dialect);
 			}
 
 			DbConnection connection;