Reverted the changes in DriverBase and simplified BatchingCommandSet

Author: maca88

src/NHibernate/AdoNet/GenericBatchingBatcher.cs

@@ -135,10 +135,10 @@ public override void CloseCommands()
 		protected override void Dispose(bool isDisposing)
 		{
 			base.Dispose(isDisposing);
-			_currentBatch.Dispose();
+			_currentBatch.Clear();
 		}
 
-		private partial class BatchingCommandSet : IDisposable
+		private partial class BatchingCommandSet
 		{
 			private readonly GenericBatchingBatcher _batcher;
 			private readonly SqlStringBuilder _sql = new SqlStringBuilder();
@@ -178,7 +178,8 @@ public void Append(DbParameterCollection parameters)
 				{
 					_commandType = _batcher.CurrentCommand.CommandType;
 				}
-				_sql.Add(PrepareSqlString(_batcher.CurrentCommandSql));
+				
+				_sql.Add(_batcher.CurrentCommandSql.Copy());
 				_sqlTypes.AddRange(_batcher.CurrentCommandParameterTypes);
 
 				foreach (DbParameter parameter in parameters)
@@ -193,6 +194,7 @@ public void Append(DbParameterCollection parameters)
 					});
 				}
 				CountOfCommands++;
+				CountOfParameters += parameters.Count;
 			}
 
 			public int ExecuteNonQuery()
@@ -220,19 +222,6 @@ public int ExecuteNonQuery()
 				return batcherCommand.ExecuteNonQuery();
 			}
 
-			private SqlString PrepareSqlString(SqlString sql)
-			{
-				sql = sql.Copy();
-				foreach (var part in sql)
-				{
-					if (part is Parameter param)
-					{
-						param.ParameterPosition = CountOfParameters++;
-					}
-				}
-				return sql;
-			}
-
 			public void Clear()
 			{
 				CountOfParameters = 0;
@@ -241,11 +230,6 @@ public void Clear()
 				_sqlTypes.Clear();
 				_parameters.Clear();
 			}
-
-			public void Dispose()
-			{
-				Clear();
-			}
 		}
 	}
 }

src/NHibernate/Async/AdoNet/GenericBatchingBatcher.cs

@@ -95,7 +95,7 @@ protected override async Task DoExecuteBatchAsync(DbCommand ps, CancellationToke
 			}
 		}
 
-		private partial class BatchingCommandSet : IDisposable
+		private partial class BatchingCommandSet
 		{
 
 			public async Task<int> ExecuteNonQueryAsync(CancellationToken cancellationToken)

src/NHibernate/Driver/DriverBase.cs

@@ -133,7 +133,7 @@ public virtual DbCommand GenerateCommand(CommandType type, SqlString sqlString,
 
 			SetCommandTimeout(cmd);
 			SetCommandText(cmd, sqlString);
-			SetCommandParameters(cmd, parameterTypes, sqlString.GetParameters().ToArray());
+			SetCommandParameters(cmd, parameterTypes);
 
 			return cmd;
 		}
@@ -156,9 +156,9 @@ protected virtual void SetCommandTimeout(DbCommand cmd)
 			}
 		}
 
-		private static string ToParameterName(int index, string prefix = null)
+		private static string ToParameterName(int index)
 		{
-			return string.IsNullOrEmpty(prefix) ?  "p" + index : prefix + index;
+			return "p" + index;
 		}
 
 		string ISqlParameterFormatter.GetParameterName(int index)
@@ -178,23 +178,13 @@ protected virtual SqlStringFormatter GetSqlStringFormatter()
 			return new SqlStringFormatter(this, ";");
 		}
 
-		private void SetCommandParameters(DbCommand cmd, SqlType[] sqlTypes, Parameter[] parameters)
+		private void SetCommandParameters(DbCommand cmd, SqlType[] sqlTypes)
 		{
-			var usedParameters = new HashSet<int>();
-			for (var i = 0; i < sqlTypes.Length; i++)
+			for (int i = 0; i < sqlTypes.Length; i++)
 			{
-				var parameter = parameters.Length > i ? parameters[i] : null;
-				var position = parameter?.ParameterPosition ?? i;
-				// Use a different prefix when two or more parameters have the same position in
-				// order to prevert a name collision. When this happens, only one parameter will
-				// be used while the others are added to prevent an ArgumentOutOfRangeException
-				// being thrown when NamedParameterSpecification.Bind method is called.
-				var paramName = usedParameters.Contains(position)
-					? ToParameterName(i, "fp")
-					: ToParameterName(position);
+				string paramName = ToParameterName(i);
 				var dbParam = GenerateParameter(cmd, paramName, sqlTypes[i]);
 				cmd.Parameters.Add(dbParam);
-				usedParameters.Add(position);
 			}
 		}