[Nhibernate-commit] SF.net SVN: nhibernate:[5699] trunk/nhibernate/src/NHibernate

[<fab...@us...>]

Revision: 5699
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5699&view=rev
Author:   fabiomaulo
Date:     2011-04-14 17:39:19 +0000 (Thu, 14 Apr 2011)

Log Message:
-----------
Fix NH-2652

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaMetadataUpdater.cs
    trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs

Modified: trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaMetadataUpdater.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaMetadataUpdater.cs	2011-04-13 23:07:40 UTC (rev 5698)
+++ trunk/nhibernate/src/NHibernate/Tool/hbm2ddl/SchemaMetadataUpdater.cs	2011-04-14 17:39:19 UTC (rev 5699)
@@ -19,7 +19,7 @@
 
 		public static void QuoteTableAndColumns(Configuration configuration)
 		{
-			ISet<string> reservedDb = GetReservedWords(configuration.Properties);
+			ISet<string> reservedDb = GetReservedWords(configuration.GetDerivedProperties());
 			foreach (var cm in configuration.ClassMappings)
 			{
 				QuoteTable(cm.Table, reservedDb);

Modified: trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs	2011-04-13 23:07:40 UTC (rev 5698)
+++ trunk/nhibernate/src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs	2011-04-14 17:39:19 UTC (rev 5699)
@@ -163,5 +163,28 @@
 			new SchemaExport(configuration).Drop(false, false);
 		}
 
+		[Test]
+		public void WhenConfiguredOnlyExplicitAutoQuote()
+		{
+			var configuration = TestConfigurationHelper.GetDefaultConfiguration();
+			var configuredDialect = Dialect.Dialect.GetDialect();
+			if(!configuredDialect.DefaultProperties.ContainsKey(Environment.ConnectionDriver))
+			{
+				Assert.Ignore(GetType() + " does not apply to " + configuredDialect);
+			}
+			configuration.Properties.Remove(Environment.ConnectionDriver);
+			configuration.AddResource("NHibernate.Test.Tools.hbm2ddl.SchemaMetadataUpdaterTest.HeavyEntity.hbm.xml",
+																GetType().Assembly);
+
+			SchemaMetadataUpdater.QuoteTableAndColumns(configuration);
+
+			var cm = configuration.GetClassMapping(typeof(Order));
+			Assert.That(cm.Table.IsQuoted);
+			var culs = new List<Column>(cm.Table.ColumnIterator);
+			Assert.That(GetColumnByName(culs, "From").IsQuoted);
+			Assert.That(GetColumnByName(culs, "And").IsQuoted);
+			Assert.That(GetColumnByName(culs, "Select").IsQuoted);
+			Assert.That(!GetColumnByName(culs, "Name").IsQuoted);
+		}
 	}
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.