Merge branch 'master' of https://github.com/benfulton/fluent-nhibernate into benfulton-master

Author: jagregory

.gitattributes

@@ -0,0 +1,2 @@
+[core]
+        autocrlf = false

src/FluentNHibernate.Testing/Cfg/Db/PersistenceConfigurationTester.cs

@@ -30,6 +30,25 @@ public string ValueOf(string key)
         }
         #endregion
 
+        [Test]
+        public void ConfigureProperties_should_not_override_values_already_set()
+        {
+            _nhibConfig = new Configuration();
+            _nhibConfig.Properties["proxyfactory.factory_class"] = "foo";
+            ValueOf("proxyfactory.factory_class").ShouldEqual("foo");
+           
+        }
+
+        [Test]
+        public void ConfigureProperties_should_override_values_already_set_with_values_set_in_code()
+        {
+            _nhibConfig = new Configuration();
+            _nhibConfig.Properties["proxyfactory.factory_class"] = "foo";
+            _config.ProxyFactoryFactory("bar").ConfigureProperties(_nhibConfig);
+            ValueOf("proxyfactory.factory_class").ShouldEqual("bar");
+
+        }
+
         [Test]
         public void Setting_raw_values_should_populate_dictionary()
         {

src/FluentNHibernate/Cfg/Db/PersistenceConfiguration.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using NHibernate.Bytecode;
 using NHibernate.Connection;
 using NHibernate.Dialect;
@@ -67,12 +68,34 @@ protected virtual IDictionary<string, string> CreateProperties()
 
             return values;
         }
+        
+        static IEnumerable<string> OverridenDefaults(IDictionary<string,string> settings)
+        {
+            if (settings[ConnectionProviderKey] != DefaultConnectionProviderClassName)
+                yield return ConnectionProviderKey;
+
+            if (settings[ProxyFactoryFactoryClassKey] != DefaultProxyFactoryFactoryClassName)
+                yield return ProxyFactoryFactoryClassKey;
+        }
+
+        private static IEnumerable<string> KeysToPreserve(NHibConfiguration nhibernateConfig, IDictionary<string, string> settings)
+        {
+            var @default = new NHibConfiguration();
+            return nhibernateConfig.Properties
+                .Except(@default.Properties)
+                    .Select(k => k.Key)
+                    .Except(OverridenDefaults(settings));
+        }
 
         public NHibConfiguration ConfigureProperties(NHibConfiguration nhibernateConfig)
         {
             var settings = CreateProperties();
+            var keepers = KeysToPreserve(nhibernateConfig, settings);
 
-            nhibernateConfig.SetProperties(settings);
+            foreach (var kv in settings.Where(s => !keepers.Contains(s.Key)))
+            {
+                nhibernateConfig.SetProperty(kv.Key, kv.Value);
+            }
 
             return nhibernateConfig;
         }