NH-4043 - Use case-insensitive HashSet for keywords.

Author: ngbrown

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

@@ -38,7 +38,7 @@ public void CanRetrieveReservedWords()
 		[Test]
 		public void UpdateReservedWordsInDialect()
 		{
-			var reservedDb = new HashSet<string>();
+			var reservedDb = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 			var configuration = TestConfigurationHelper.GetDefaultConfiguration();
 			var dialect = Dialect.Dialect.GetDialect(configuration.Properties);
 			var connectionHelper = new ManagedProviderConnectionHelper(configuration.Properties);
@@ -58,7 +58,7 @@ public void UpdateReservedWordsInDialect()
 
 			var sf = (ISessionFactoryImplementor) configuration.BuildSessionFactory();
 			SchemaMetadataUpdater.Update(sf);
-			var match = reservedDb.Intersect(sf.Dialect.Keywords);
+			var match = reservedDb.Intersect(sf.Dialect.Keywords, StringComparer.OrdinalIgnoreCase);
 
 			// tests that nothing in the first metaData.GetReservedWords() is left out of the second metaData.GetReservedWords() call.
 			// i.e. always passes.
@@ -68,7 +68,7 @@ public void UpdateReservedWordsInDialect()
 		[Test]
 		public void EnsureReservedWordsHardCodedInDialect()
 		{
-			var reservedDb = new HashSet<string>();
+			var reservedDb = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 			var configuration = TestConfigurationHelper.GetDefaultConfiguration();
 			var dialect = Dialect.Dialect.GetDialect(configuration.Properties);
 			var connectionHelper = new ManagedProviderConnectionHelper(configuration.Properties);
@@ -90,7 +90,7 @@ public void EnsureReservedWordsHardCodedInDialect()
 			var sf = (ISessionFactoryImplementor)configuration.BuildSessionFactory();
 
 			// use the dialect as configured, with no update
-			var match = reservedDb.Intersect(sf.Dialect.Keywords).ToList();
+			var match = reservedDb.Intersect(sf.Dialect.Keywords, StringComparer.OrdinalIgnoreCase).ToList();
 
 			// tests that nothing in metaData.GetReservedWords() is left out of the Dialect.Keywords (without a refresh).
 			var differences = reservedDb.Except(match).ToList();
@@ -99,7 +99,7 @@ public void EnsureReservedWordsHardCodedInDialect()
 				Console.WriteLine("Update Dialect {0} with RegisterKeyword:", sf.Dialect.GetType().Name);
 				foreach (var keyword in differences.OrderBy(x => x))
 				{
-					Console.WriteLine("  RegisterKeyword(\"{0}\");", keyword);
+					Console.WriteLine("  RegisterKeyword(\"{0}\");", keyword.ToLowerInvariant());
 				}
 			}
 
@@ -114,7 +114,7 @@ public void EnsureReservedWordsHardCodedInDialect()
 		[Test]
 		public void CheckForExcessReservedWordsHardCodedInDialect()
 		{
-			var reservedDb = new HashSet<string>();
+			var reservedDb = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 			var configuration = TestConfigurationHelper.GetDefaultConfiguration();
 			var dialect = Dialect.Dialect.GetDialect(configuration.Properties);
 			var connectionHelper = new ManagedProviderConnectionHelper(configuration.Properties);
@@ -124,7 +124,7 @@ public void CheckForExcessReservedWordsHardCodedInDialect()
 				var metaData = dialect.GetDataBaseSchema(connectionHelper.Connection);
 				foreach (var rw in metaData.GetReservedWords())
 				{
-					reservedDb.Add(rw.ToLowerInvariant());
+					reservedDb.Add(rw);
 				}
 			}
 			finally
@@ -136,13 +136,13 @@ public void CheckForExcessReservedWordsHardCodedInDialect()
 
 			// use the dialect as configured, with no update
 			// tests that nothing in Dialect.Keyword is not in metaData.GetReservedWords()
-			var differences = sf.Dialect.Keywords.Except(reservedDb).Except(AnsiSqlKeywords.Sql2003).ToList();
+			var differences = sf.Dialect.Keywords.Except(reservedDb, StringComparer.OrdinalIgnoreCase).Except(AnsiSqlKeywords.Sql2003, StringComparer.OrdinalIgnoreCase).ToList();
 			if (differences.Count > 0)
 			{
 				Console.WriteLine("Excess RegisterKeyword in Dialect {0}:", sf.Dialect.GetType().Name);
 				foreach (var keyword in differences.OrderBy(x => x))
 				{
-					Console.WriteLine("  RegisterKeyword(\"{0}\");", keyword);
+					Console.WriteLine("  RegisterKeyword(\"{0}\");", keyword.ToLowerInvariant());
 				}
 			}
 
@@ -189,7 +189,7 @@ public void AutoQuoteTableAndColumnsAtStratup()
 		[Test]
 		public void AutoQuoteTableAndColumnsAtStratupIncludeKeyWordsImport()
 		{
-			var reservedDb = new HashSet<string>();
+			var reservedDb = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 			var configuration = TestConfigurationHelper.GetDefaultConfiguration();
 			var dialect = Dialect.Dialect.GetDialect(configuration.Properties);
 			var connectionHelper = new ManagedProviderConnectionHelper(configuration.Properties);
@@ -211,8 +211,8 @@ public void AutoQuoteTableAndColumnsAtStratupIncludeKeyWordsImport()
 			configuration.AddResource("NHibernate.Test.Tools.hbm2ddl.SchemaMetadataUpdaterTest.HeavyEntity.hbm.xml",
 																GetType().Assembly);
 			var sf = (ISessionFactoryImplementor)configuration.BuildSessionFactory();
-			var match = reservedDb.Intersect(sf.Dialect.Keywords);
-			Assert.That(match, Is.EquivalentTo(reservedDb));
+			var match = reservedDb.Intersect(sf.Dialect.Keywords, StringComparer.OrdinalIgnoreCase);
+			Assert.That(match, Is.EquivalentTo(reservedDb).IgnoreCase);
 		}
 
 		private static Column GetColumnByName(IEnumerable<Column> columns, string colName)

src/NHibernate/Dialect/Dialect.cs

@@ -82,7 +82,7 @@ protected Dialect()
 
 			_sqlFunctions = CollectionHelper.CreateCaseInsensitiveHashtable(StandardAggregateFunctions);
 
-			_sqlKeywords = new HashSet<string>(AnsiSqlKeywords.Sql2003);
+			_sqlKeywords = new HashSet<string>(AnsiSqlKeywords.Sql2003, StringComparer.OrdinalIgnoreCase);
 
 			// standard sql92 functions (can be overridden by subclasses)
 			RegisterFunction("substring", new AnsiSubstringFunction());

src/NHibernate/Impl/SessionFactoryImpl.cs

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

src/NHibernate/Tool/hbm2ddl/SchemaMetadataUpdater.cs

@@ -74,24 +74,24 @@ private static ISet<string> GetReservedWords(IConnectionProvider connectionProvi
 
 		private static ISet<string> GetReservedWords(Dialect.Dialect dialect, IConnectionHelper connectionHelper)
 		{
-			ISet<string> reservedWords = new HashSet<string>(dialect.Keywords);
+			ISet<string> reservedWords = new HashSet<string>(dialect.Keywords, StringComparer.OrdinalIgnoreCase);
 			var metaData = dialect.GetDataBaseSchema(connectionHelper.Connection);
 			foreach (var rw in metaData.GetReservedWords())
 			{
-				reservedWords.Add(rw.ToLowerInvariant());
+				reservedWords.Add(rw);
 			}
 			return reservedWords;
 		}
 
 		private static void QuoteTable(Table table, ICollection<string> reservedDb)
 		{
-			if (!table.IsQuoted && reservedDb.Contains(table.Name.ToLowerInvariant()))
+			if (!table.IsQuoted && reservedDb.Contains(table.Name))
 			{
 				table.Name = GetNhQuoted(table.Name);
 			}
 			foreach (var column in table.ColumnIterator)
 			{
-				if (!column.IsQuoted && reservedDb.Contains(column.Name.ToLowerInvariant()))
+				if (!column.IsQuoted && reservedDb.Contains(column.Name))
 				{
 					column.Name = GetNhQuoted(column.Name);
 				}