NH-4013 - Guarantee cleanup on failed sql execution.

Author: fredericDelaporte

src/NHibernate/AdoNet/MySqlClientBatchingBatcher.cs

@@ -69,26 +69,31 @@ public override void AddToBatch(IExpectation expectation)
 
 		protected override void DoExecuteBatch(DbCommand ps)
 		{
-			Log.DebugFormat("Executing batch");
-			CheckReaders();
-			if (Factory.Settings.SqlStatementLogger.IsDebugEnabled)
-			{
-				Factory.Settings.SqlStatementLogger.LogBatchCommand(currentBatchCommandsLog.ToString());
-			}
-
-			int rowsAffected;
 			try
 			{
-				rowsAffected = currentBatch.ExecuteNonQuery();
+				Log.DebugFormat("Executing batch");
+				CheckReaders();
+				if (Factory.Settings.SqlStatementLogger.IsDebugEnabled)
+				{
+					Factory.Settings.SqlStatementLogger.LogBatchCommand(currentBatchCommandsLog.ToString());
+				}
+
+				int rowsAffected;
+				try
+				{
+					rowsAffected = currentBatch.ExecuteNonQuery();
+				}
+				catch (DbException e)
+				{
+					throw ADOExceptionHelper.Convert(Factory.SQLExceptionConverter, e, "could not execute batch command.");
+				}
+
+				Expectations.VerifyOutcomeBatched(totalExpectedRowsAffected, rowsAffected);
 			}
-			catch (DbException e)
+			finally
 			{
-				throw ADOExceptionHelper.Convert(Factory.SQLExceptionConverter, e, "could not execute batch command.");
+				ClearCurrentBatch();
 			}
-
-			Expectations.VerifyOutcomeBatched(totalExpectedRowsAffected, rowsAffected);
-
-			ClearCurrentBatch();
 		}
 
 		private MySqlClientSqlCommandSet CreateConfiguredBatch()

src/NHibernate/AdoNet/SqlClientBatchingBatcher.cs

@@ -61,7 +61,7 @@ public override void AddToBatch(IExpectation expectation)
 			{
 				Log.Debug("Adding to batch:" + lineWithParameters);
 			}
-			_currentBatch.Append((System.Data.SqlClient.SqlCommand) batchUpdate);
+			_currentBatch.Append((System.Data.SqlClient.SqlCommand)batchUpdate);
 
 			if (_currentBatch.CountOfCommands >= _batchSize)
 			{
@@ -71,27 +71,31 @@ public override void AddToBatch(IExpectation expectation)
 
 		protected override void DoExecuteBatch(DbCommand ps)
 		{
-			Log.DebugFormat("Executing batch");
-			CheckReaders();
-			Prepare(_currentBatch.BatchCommand);
-			if (Factory.Settings.SqlStatementLogger.IsDebugEnabled)
-			{
-				Factory.Settings.SqlStatementLogger.LogBatchCommand(_currentBatchCommandsLog.ToString());
-			}
-
-			int rowsAffected;
 			try
 			{
-				rowsAffected = _currentBatch.ExecuteNonQuery();
+				Log.DebugFormat("Executing batch");
+				CheckReaders();
+				Prepare(_currentBatch.BatchCommand);
+				if (Factory.Settings.SqlStatementLogger.IsDebugEnabled)
+				{
+					Factory.Settings.SqlStatementLogger.LogBatchCommand(_currentBatchCommandsLog.ToString());
+				}
+				int rowsAffected;
+				try
+				{
+					rowsAffected = _currentBatch.ExecuteNonQuery();
+				}
+				catch (DbException e)
+				{
+					throw ADOExceptionHelper.Convert(Factory.SQLExceptionConverter, e, "could not execute batch command.");
+				}
+
+				Expectations.VerifyOutcomeBatched(_totalExpectedRowsAffected, rowsAffected);
 			}
-			catch (DbException e)
+			finally
 			{
-				throw ADOExceptionHelper.Convert(Factory.SQLExceptionConverter, e, "could not execute batch command.");
+				ClearCurrentBatch();
 			}
-
-			Expectations.VerifyOutcomeBatched(_totalExpectedRowsAffected, rowsAffected);
-
-			ClearCurrentBatch();
 		}
 
 		private SqlClientSqlCommandSet CreateConfiguredBatch()