Removes ExpandQueryParameters and RemoveUnusedCommandParameters methods from IBatcher

These methods do not seem relevant to the batch interface. In fact, ExpandQueryParameters is already on the IDriver interface which seems more appropriate.

Author: julian-maughan

src/NHibernate/AdoNet/AbstractBatcher.cs

@@ -222,16 +222,6 @@ public int ExecuteNonQuery(IDbCommand cmd)
 		    }
 		}
 
-		public void RemoveUnusedCommandParameters(IDbCommand cmd, SqlString sqlString)
-		{
-			Driver.RemoveUnusedCommandParameters(cmd, sqlString);
-		}
-
-		public void ExpandQueryParameters(IDbCommand cmd, SqlString sqlString)
-		{
-			Driver.ExpandQueryParameters(cmd, sqlString);
-		}
-
 		public IDataReader ExecuteReader(IDbCommand cmd)
 		{
 			CheckReaders();

src/NHibernate/Engine/IBatcher.cs

@@ -131,25 +131,6 @@ public interface IBatcher : IDisposable
 		/// </remarks>
 		int ExecuteNonQuery(IDbCommand cmd);
 
-		/// <summary>
-		/// Remove 'extra' parameters from the IDbCommand
-		/// </summary>
-		/// <remarks>
-		/// We sometimes create more parameters than necessary (see NH-2792 & also comments in SqlStringFormatter.ISqlStringVisitor.Parameter)
-		/// </remarks>
-		void RemoveUnusedCommandParameters(IDbCommand cmd, SqlString sqlString);
-
-		/// <summary>
-		/// Expand the parameters of the cmd to have a single parameter for each parameter in the
-		/// sql string
-		/// </summary>
-		/// <remarks>
-		/// This is for databases that do not support named parameters.  So, instead of a single parameter
-		/// for 'select ... from MyTable t where t.Col1 = @p0 and t.Col2 = @p0' we can issue
-		/// 'select ... from MyTable t where t.Col1 = ? and t.Col2 = ?'
-		/// </remarks>
-		void ExpandQueryParameters(IDbCommand cmd, SqlString sqlString);
-
 		/// <summary>
 		/// Must be called when an exception occurs.
 		/// </summary>

src/NHibernate/Loader/Loader.cs

@@ -10,7 +10,8 @@
 
 using NHibernate.AdoNet;
 using NHibernate.Cache;
-using NHibernate.Collection;
+using NHibernate.Collection;
+using NHibernate.Driver;
 using NHibernate.Engine;
 using NHibernate.Event;
 using NHibernate.Exceptions;
@@ -1146,10 +1147,11 @@ protected internal virtual IDbCommand PrepareQueryCommand(QueryParameters queryP
 					command.CommandTimeout = selection.Timeout;
 				}
 
-				sqlCommand.Bind(command, session);
-
-				session.Batcher.RemoveUnusedCommandParameters(command, sqlString);
-				session.Batcher.ExpandQueryParameters(command, sqlString);
+				sqlCommand.Bind(command, session);
+
+				IDriver driver = factory.ConnectionProvider.Driver;
+				driver.RemoveUnusedCommandParameters(command, sqlString);
+				driver.ExpandQueryParameters(command, sqlString);
 			}
 			catch (HibernateException)
 			{