Move Prepare(DbBatch) to DbBatchBatcher

Author: gliljas

src/NHibernate.Test/Ado/BatcherFixture.cs

@@ -31,10 +31,12 @@ protected override void Configure(Configuration configuration)
 			configuration.SetProperty(Environment.FormatSql, "true");
 			configuration.SetProperty(Environment.GenerateStatistics, "true");
 			configuration.SetProperty(Environment.BatchSize, "10");
+			#if NET6_0_OR_GREATER
 			if (_useDbBatch)
 			{
-				configuration.SetProperty("usedbbatch", "true");
+				configuration.SetProperty(Environment.BatchStrategy, typeof(DbBatchBatcherFactory).AssemblyQualifiedName);
 			}
+			#endif
 		}
 
 		protected override bool AppliesTo(Engine.ISessionFactoryImplementor factory)

src/NHibernate.Test/Async/Ado/BatcherFixture.cs

@@ -43,10 +43,12 @@ protected override void Configure(Configuration configuration)
 			configuration.SetProperty(Environment.FormatSql, "true");
 			configuration.SetProperty(Environment.GenerateStatistics, "true");
 			configuration.SetProperty(Environment.BatchSize, "10");
+			#if NET6_0_OR_GREATER
 			if (_useDbBatch)
 			{
-				configuration.SetProperty("usedbbatch", "true");
+				configuration.SetProperty(Environment.BatchStrategy, typeof(DbBatchBatcherFactory).AssemblyQualifiedName);
 			}
+			#endif
 		}
 
 		protected override bool AppliesTo(Engine.ISessionFactoryImplementor factory)

src/NHibernate/AdoNet/AbstractBatcher.cs

@@ -136,45 +136,6 @@ protected void Prepare(DbCommand cmd)
 			}
 		}
 
-#if NET6_0_OR_GREATER
-		/// <summary>
-		/// Prepares the <see cref="DbBatch"/> for execution in the database.
-		/// </summary>
-		/// <remarks>
-		/// This takes care of hooking the <see cref="DbBatch"/> up to an <see cref="DbConnection"/>
-		/// and <see cref="DbTransaction"/> if one exists.  It will call <c>Prepare</c> if the Driver
-		/// supports preparing batches.
-		/// </remarks>
-		protected void Prepare(DbBatch batch)
-		{
-			try
-			{
-				var sessionConnection = _connectionManager.GetConnection();
-
-				if (batch.Connection != null)
-				{
-					// make sure the commands connection is the same as the Sessions connection
-					// these can be different when the session is disconnected and then reconnected
-					if (batch.Connection != sessionConnection)
-					{
-						batch.Connection = sessionConnection;
-					}
-				}
-				else
-				{
-					batch.Connection = sessionConnection;
-				}
-
-				_connectionManager.EnlistInTransaction(batch);
-				(Driver as IDriverWithBatchSupport).PrepareBatch(batch);
-			}
-			catch (InvalidOperationException ioe)
-			{
-				throw new ADOException("While preparing " + string.Join(Environment.NewLine, batch.BatchCommands.Select(x=>x.CommandText)) + " an error occurred", ioe);
-			}
-		}
-#endif
-
 		public virtual DbCommand PrepareBatchCommand(CommandType type, SqlString sql, SqlType[] parameterTypes)
 		{
 			if (sql.Equals(_batchCommandSql) && ArrayHelper.ArrayEquals(parameterTypes, _batchCommandParameterTypes))

src/NHibernate/AdoNet/DbBatchBatcher.cs

@@ -1,14 +1,14 @@
 #if NET6_0_OR_GREATER
 using System;
 using System.Data.Common;
+using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using NHibernate.AdoNet.Util;
 using NHibernate.Driver;
 using NHibernate.Engine;
 using NHibernate.Exceptions;
-using NHibernate.Util;
 
 namespace NHibernate.AdoNet
 {
@@ -19,6 +19,7 @@ public class DbBatchBatcher : AbstractBatcher
 		private DbBatch _currentBatch;
 		private StringBuilder _currentBatchCommandsLog;
 		private readonly int _defaultTimeout;
+		private readonly ConnectionManager _connectionManager;
 
 		public DbBatchBatcher(ConnectionManager connectionManager, IInterceptor interceptor)
 			: base(connectionManager, interceptor)
@@ -32,6 +33,7 @@ public DbBatchBatcher(ConnectionManager connectionManager, IInterceptor intercep
 			//behind an if(log.IsDebugEnabled) will cause a null reference exception 
 			//at that point.
 			_currentBatchCommandsLog = new StringBuilder().AppendLine("Batch commands:");
+			_connectionManager = connectionManager;
 		}
 
 		public override int BatchSize
@@ -253,6 +255,43 @@ protected override void Dispose(bool isDisposing)
 				Log.Warn(e, "Exception closing batcher");
 			}
 		}
+
+		/// <summary>
+		/// Prepares the <see cref="DbBatch"/> for execution in the database.
+		/// </summary>
+		/// <remarks>
+		/// This takes care of hooking the <see cref="DbBatch"/> up to an <see cref="DbConnection"/>
+		/// and <see cref="DbTransaction"/> if one exists.  It will call <c>Prepare</c> if the Driver
+		/// supports preparing batches.
+		/// </remarks>
+		protected void Prepare(DbBatch batch)
+		{
+			try
+			{
+				var sessionConnection = _connectionManager.GetConnection();
+
+				if (batch.Connection != null)
+				{
+					// make sure the commands connection is the same as the Sessions connection
+					// these can be different when the session is disconnected and then reconnected
+					if (batch.Connection != sessionConnection)
+					{
+						batch.Connection = sessionConnection;
+					}
+				}
+				else
+				{
+					batch.Connection = sessionConnection;
+				}
+
+				_connectionManager.EnlistInTransaction(batch);
+				(Driver as IDriverWithBatchSupport).PrepareBatch(batch);
+			}
+			catch (InvalidOperationException ioe)
+			{
+				throw new ADOException("While preparing " + string.Join(Environment.NewLine, batch.BatchCommands.Select(x => x.CommandText)) + " an error occurred", ioe);
+			}
+		}
 	}
 
 	public class DbBatchBatcherFactory : IBatcherFactory

src/NHibernate/Async/AdoNet/AbstractBatcher.cs

@@ -68,9 +68,6 @@ protected async Task PrepareAsync(DbCommand cmd, CancellationToken cancellationT
 			}
 		}
 
-#if NET6_0_OR_GREATER
-#endif
-
 		public virtual async Task<DbCommand> PrepareBatchCommandAsync(CommandType type, SqlString sql, SqlType[] parameterTypes, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();

src/NHibernate/Driver/MicrosoftDataSqlClientDriver.cs

@@ -20,7 +20,6 @@ public class MicrosoftDataSqlClientDriver : ReflectionBasedDriver, IEmbeddedBatc
 		private static readonly Action<object, SqlDbType> SetSqlDbType = DelegateHelper.BuildPropertySetter<SqlDbType>(System.Type.GetType("Microsoft.Data.SqlClient.SqlParameter, Microsoft.Data.SqlClient", true), "SqlDbType");
 
 		private Dialect.Dialect _dialect;
-		private bool _useDbBatch;
 
 		public MicrosoftDataSqlClientDriver()
 			: base(
@@ -71,11 +70,8 @@ public MicrosoftDataSqlClientDriver()
 		/// <inheritdoc />
 		public override DateTime MinDate => DateTime.MinValue;
 
-#if NET6_0_OR_GREATER
-		System.Type IEmbeddedBatcherFactoryProvider.BatcherFactoryClass => _useDbBatch && CanCreateBatch ? typeof(DbBatchBatcherFactory) : typeof(GenericBatchingBatcherFactory);
-#else
+
 		System.Type IEmbeddedBatcherFactoryProvider.BatcherFactoryClass => typeof(GenericBatchingBatcherFactory);
-#endif
 
 		/// <inheritdoc />
 		public virtual void AdjustParameterForValue(DbParameter parameter, SqlType sqlType, object value)
@@ -103,8 +99,6 @@ public override void Configure(IDictionary<string, string> settings)
 			base.Configure(settings);
 
 			_dialect = Dialect.Dialect.GetDialect(settings);
-
-			_useDbBatch = settings.TryGetValue("usedbbatch", out var value) && bool.Parse(value);
 		}
 
 		/// <inheritdoc />