Set the generic batcher as default batcher for drivers benefiting of it.

Author: fredericDelaporte

src/NHibernate/AdoNet/IEmbeddedBatcherFactoryProvider.cs

@@ -1,18 +1,18 @@
 namespace NHibernate.AdoNet
 {
 	/// <summary>
-	/// Provide the class of <see cref="IBatcherFactory"/> according to the configuration 
-	/// and the capabilities of the driver.
+	/// Provides a default <see cref="IBatcherFactory"/> class.
 	/// </summary>
 	/// <remarks>
-	/// By default, .Net doesn't have any batching capabilities, drivers that does have
-	/// batching support.
-	/// The BatcherFactory trough session-factory configuration section.
-	/// This interface was added in NHibernate for backdraw compatibility to have the ability
-	/// to specify a default <see cref="IBatcherFactory"/> for a specific <see cref="Driver.IDriver"/>.
+	/// This interface allows to specify a default <see cref="IBatcherFactory"/> for a specific
+	/// <see cref="Driver.IDriver"/>. The configuration setting <see cref="NHibernate.Cfg.Environment.BatchStrategy"/>
+	/// takes precedence over <c>BatcherFactoryClass</c>.
 	/// </remarks>
 	public interface IEmbeddedBatcherFactoryProvider
 	{
+		/// <summary>
+		/// The <see cref="IBatcherFactory"/> class type.
+		/// </summary>
 		System.Type BatcherFactoryClass { get;}
 	}
-}
+}

src/NHibernate/Driver/NpgsqlDriver.cs

@@ -1,5 +1,6 @@
 using System.Data;
 using System.Data.Common;
+using NHibernate.AdoNet;
 
 namespace NHibernate.Driver
 {
@@ -24,7 +25,7 @@ namespace NHibernate.Driver
 	/// <a href="http://pgfoundry.org/projects/npgsql">http://pgfoundry.org/projects/npgsql</a>. 
 	/// </p>
 	/// </remarks>
-	public class NpgsqlDriver : ReflectionBasedDriver
+	public class NpgsqlDriver : ReflectionBasedDriver, IEmbeddedBatcherFactoryProvider
 	{
 		/// <summary>
 		/// Initializes a new instance of the <see cref="NpgsqlDriver"/> class.
@@ -92,5 +93,7 @@ protected override void InitializeParameter(DbParameter dbParam, string name, Sq
 		public override bool RequiresTimeSpanForTime => (DriverVersion?.Major ?? 3) >= 3;
 
 		public override bool HasDelayedDistributedTransactionCompletion => true;
+
+		System.Type IEmbeddedBatcherFactoryProvider.BatcherFactoryClass => typeof(GenericBatchingBatcherFactory);
 	}
 }

src/NHibernate/Driver/SqlClientDriver.cs

@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+#if NETFX
 using System.Data.SqlClient;
+#endif
 using NHibernate.AdoNet;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
@@ -16,7 +18,7 @@ public class SqlClientDriver
 #if NETFX
 		: DriverBase, IEmbeddedBatcherFactoryProvider
 #else
-		: ReflectionBasedDriver
+		: ReflectionBasedDriver, IEmbeddedBatcherFactoryProvider
 #endif
 	{
 		public const int MaxSizeForAnsiClob = 2147483647; // int.MaxValue
@@ -50,6 +52,8 @@ public SqlClientDriver()
 			: base("System.Data.SqlClient", "System.Data.SqlClient.SqlConnection", "System.Data.SqlClient.SqlCommand")
 		{
 		}
+
+		System.Type IEmbeddedBatcherFactoryProvider.BatcherFactoryClass => typeof(GenericBatchingBatcherFactory);
 #else
 		/// <summary>
 		/// Creates an uninitialized <see cref="DbConnection" /> object for