Merge pull request #1600 from fredericDelaporte/MySqlBatcher

Set MySqlClientBatchingBatcher as a default batcher for MySqlDataDriver

Author: hazzik

src/NHibernate/AdoNet/MySqlClientBatchingBatcher.cs

@@ -39,6 +39,10 @@ protected override int CountOfStatementsInCurrentBatch
 
 		public override void AddToBatch(IExpectation expectation)
 		{
+			// MySql batcher cannot be initiated if a data reader is still open: check them.
+			if (CountOfStatementsInCurrentBatch == 0)
+				CheckReaders();
+
 			totalExpectedRowsAffected += expectation.ExpectedRowCount;
 			var batchUpdate = CurrentCommand;
 			Prepare(batchUpdate);

src/NHibernate/AdoNet/MySqlClientSqlCommandSet.cs

@@ -51,24 +51,17 @@ public void Dispose()
 
 		public int ExecuteNonQuery()
 		{
-			try
+			if (CountOfCommands == 0)
 			{
-				if (CountOfCommands == 0)
-				{
-					return 0;
-				}
-
-				return doExecuteNonQuery(instance);
-			}
-			catch (Exception exception)
-			{
-				throw new HibernateException("An exception occured when executing batch queries", exception);
+				return 0;
 			}
+
+			return doExecuteNonQuery(instance);
 		}
 
 		public int CountOfCommands
 		{
 			get { return countOfCommands; }
 		}
 	}
-}
+}

src/NHibernate/Async/AdoNet/MySqlClientBatchingBatcher.cs

@@ -24,6 +24,10 @@ public partial class MySqlClientBatchingBatcher : AbstractBatcher
 		public override async Task AddToBatchAsync(IExpectation expectation, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();
+			// MySql batcher cannot be initiated if a data reader is still open: check them.
+			if (CountOfStatementsInCurrentBatch == 0)
+				await (CheckReadersAsync(cancellationToken)).ConfigureAwait(false);
+
 			totalExpectedRowsAffected += expectation.ExpectedRowCount;
 			var batchUpdate = CurrentCommand;
 			await (PrepareAsync(batchUpdate, cancellationToken)).ConfigureAwait(false);

src/NHibernate/Driver/MySqlDataDriver.cs

@@ -1,4 +1,5 @@
 using System;
+using NHibernate.AdoNet;
 
 namespace NHibernate.Driver
 {
@@ -16,7 +17,7 @@ namespace NHibernate.Driver
 	/// for any updates and/or documentation regarding MySQL.
 	/// </para>
 	/// </remarks>
-	public class MySqlDataDriver : ReflectionBasedDriver
+	public class MySqlDataDriver : ReflectionBasedDriver, IEmbeddedBatcherFactoryProvider
 	{
 		/// <summary>
 		/// Initializes a new instance of the <see cref="MySqlDataDriver"/> class.
@@ -95,5 +96,7 @@ public override bool SupportsMultipleQueries
 		// https://dev.mysql.com/doc/refman/5.7/en/datetime.html
 		/// <inheritdoc />
 		public override DateTime MinDate => new DateTime(1000, 1, 1);
+
+		System.Type IEmbeddedBatcherFactoryProvider.BatcherFactoryClass => typeof(MySqlClientBatchingBatcherFactory);
 	}
 }