WIP: Support for DbBatch

Author: gliljas

src/NHibernate.Test/Ado/BatcherFixture.cs

@@ -4,9 +4,18 @@
 
 namespace NHibernate.Test.Ado
 {
-	[TestFixture]
+#if NET6_0_OR_GREATER
+	[TestFixture(true)]
+#endif
+	[TestFixture(false)]
 	public class BatcherFixture: TestCase
 	{
+		private readonly bool _useDbBatch;
+
+		public BatcherFixture(bool useDbBatch)
+		{
+			_useDbBatch = useDbBatch;
+		}
 		protected override string MappingsAssembly
 		{
 			get { return "NHibernate.Test"; }
@@ -22,10 +31,20 @@ protected override void Configure(Configuration configuration)
 			configuration.SetProperty(Environment.FormatSql, "true");
 			configuration.SetProperty(Environment.GenerateStatistics, "true");
 			configuration.SetProperty(Environment.BatchSize, "10");
+			if (_useDbBatch)
+			{
+				configuration.SetProperty("usedbbatch", "true");
+			}
 		}
 
 		protected override bool AppliesTo(Engine.ISessionFactoryImplementor factory)
 		{
+#if NET6_0_OR_GREATER
+			if (_useDbBatch)
+			{
+				return factory.Settings.BatcherFactory is DbBatchBatcherFactory;
+			}
+#endif
 			return !(factory.Settings.BatcherFactory is NonBatchingBatcherFactory);
 		}
 

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

@@ -16,9 +16,18 @@ namespace NHibernate.Test.Ado
 {
 	using System.Threading.Tasks;
 	using System.Threading;
-	[TestFixture]
+#if NET6_0_OR_GREATER
+	[TestFixture(true)]
+#endif
+	[TestFixture(false)]
 	public class BatcherFixtureAsync: TestCase
 	{
+		private readonly bool _useDbBatch;
+
+		public BatcherFixtureAsync(bool useDbBatch)
+		{
+			_useDbBatch = useDbBatch;
+		}
 		protected override string MappingsAssembly
 		{
 			get { return "NHibernate.Test"; }
@@ -34,10 +43,20 @@ protected override void Configure(Configuration configuration)
 			configuration.SetProperty(Environment.FormatSql, "true");
 			configuration.SetProperty(Environment.GenerateStatistics, "true");
 			configuration.SetProperty(Environment.BatchSize, "10");
+			if (_useDbBatch)
+			{
+				configuration.SetProperty("usedbbatch", "true");
+			}
 		}
 
 		protected override bool AppliesTo(Engine.ISessionFactoryImplementor factory)
 		{
+#if NET6_0_OR_GREATER
+			if (_useDbBatch)
+			{
+				return factory.Settings.BatcherFactory is DbBatchBatcherFactory;
+			}
+#endif
 			return !(factory.Settings.BatcherFactory is NonBatchingBatcherFactory);
 		}
 

src/NHibernate.Test/NHibernate.Test.csproj

@@ -62,7 +62,7 @@
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Microsoft.AspNetCore.OData" Version="7.7.0" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0-preview4.23342.2" />
     <PackageReference Include="NHibernate.Caches.CoreDistributedCache.Memory" Version="5.9.0" />
     <PackageReference Include="NHibernate.Caches.Util.JsonSerializer" Version="5.9.0" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.117" />

src/NHibernate/AdoNet/AbstractBatcher.cs

@@ -12,6 +12,7 @@
 using NHibernate.SqlTypes;
 using NHibernate.Util;
 using NHibernate.AdoNet.Util;
+using System.Linq;
 
 namespace NHibernate.AdoNet
 {
@@ -135,6 +136,45 @@ 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/ConnectionManager.cs

@@ -514,6 +514,30 @@ public void EnlistInTransaction(DbCommand command)
 			}
 		}
 
+#if NET6_0_OR_GREATER
+		/// <summary>
+		/// Enlist a batch in the current transaction, if any.
+		/// </summary>
+		/// <param name="batch">The batch to enlist.</param>
+		public void EnlistInTransaction(DbBatch batch)
+		{
+			if (batch == null)
+				throw new ArgumentNullException(nameof(batch));
+
+			if (_transaction is ITransactionWithBatchSupport transactionWithBatch)
+			{
+				transactionWithBatch.Enlist(batch);
+				return;
+			}
+
+			if (batch.Transaction != null)
+			{
+				_log.Warn("set a nonnull DbCommand.Transaction to null because the Session had no Transaction");
+				batch.Transaction = null;
+			}
+		}
+#endif
+
 		/// <summary>
 		/// Enlist the connection into provided transaction if the connection should be enlisted.
 		/// Do nothing in case an explicit transaction is ongoing.