NH-3895 - Fix expand parameters too.

Author: fredericDelaporte

src/NHibernate.Test/NHSpecificTest/NH3567/Mappings.hbm.xml

@@ -25,4 +25,4 @@
 
     <many-to-one name="Post" column="PostId" not-null="true"/>
   </class>
-</hibernate-mapping>
+</hibernate-mapping>

src/NHibernate.Test/TypesTest/DateTimeTypeFixture.cs

@@ -329,9 +329,9 @@ void IDriver.RemoveUnusedCommandParameters(DbCommand cmd, SqlString sqlString)
 			_driverImplementation.RemoveUnusedCommandParameters(cmd, sqlString);
 		}
 
-		void IDriver.ExpandQueryParameters(DbCommand cmd, SqlString sqlString)
+		void IDriver.ExpandQueryParameters(DbCommand cmd, SqlString sqlString, SqlType[] parameterTypes)
 		{
-			_driverImplementation.ExpandQueryParameters(cmd, sqlString);
+			_driverImplementation.ExpandQueryParameters(cmd, sqlString, parameterTypes);
 		}
 
 		IResultSetsCommand IDriver.GetResultSetsCommand(ISessionImplementor session)

src/NHibernate/Async/Loader/Loader.cs

@@ -825,7 +825,7 @@ protected internal virtual async Task<DbCommand> PrepareQueryCommandAsync(QueryP
 
 				IDriver driver = _factory.ConnectionProvider.Driver;
 				driver.RemoveUnusedCommandParameters(command, sqlString);
-				driver.ExpandQueryParameters(command, sqlString);
+				driver.ExpandQueryParameters(command, sqlString, sqlCommand.ParameterTypes);
 			}
 			catch (HibernateException)
 			{

src/NHibernate/Driver/DriverBase.cs

@@ -231,7 +231,7 @@ public void RemoveUnusedCommandParameters(DbCommand cmd, SqlString sqlString)
 				.ForEach(unusedParameterName => cmd.Parameters.RemoveAt(unusedParameterName));
 		}
 
-		public virtual void ExpandQueryParameters(DbCommand cmd, SqlString sqlString)
+		public virtual void ExpandQueryParameters(DbCommand cmd, SqlString sqlString, SqlType[] parameterTypes)
 		{
 			if (UseNamedPrefixInSql)
 				return;  // named parameters are ok
@@ -242,8 +242,10 @@ public virtual void ExpandQueryParameters(DbCommand cmd, SqlString sqlString)
 				var parameter = part as Parameter;
 				if (parameter != null)
 				{
-					var originalParameter = cmd.Parameters[parameter.ParameterPosition.Value];
-					expandedParameters.Add(CloneParameter(cmd, originalParameter));
+					var index = parameter.ParameterPosition.Value;
+					var originalParameter = cmd.Parameters[index];
+					var originalType = parameterTypes[index];
+					expandedParameters.Add(CloneParameter(cmd, originalParameter, originalType));
 				}
 			}
 
@@ -262,11 +264,9 @@ public virtual bool SupportsMultipleQueries
 			get { return false; }
 		}
 
-		protected virtual DbParameter CloneParameter(DbCommand cmd, DbParameter originalParameter)
+		protected virtual DbParameter CloneParameter(DbCommand cmd, DbParameter originalParameter, SqlType originalType)
 		{
-			var clone = cmd.CreateParameter();
-			clone.DbType = originalParameter.DbType;
-			clone.ParameterName = originalParameter.ParameterName;
+			var clone = GenerateParameter(cmd, originalParameter.ParameterName, originalType);
 			clone.Value = originalParameter.Value;
 			return clone;
 		}

src/NHibernate/Driver/IDriver.cs

@@ -105,7 +105,7 @@ public interface IDriver
 		/// 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(DbCommand cmd, SqlString sqlString);
+		void ExpandQueryParameters(DbCommand cmd, SqlString sqlString, SqlType[] parameterTypes);
 
 		IResultSetsCommand GetResultSetsCommand(ISessionImplementor session);
 		bool SupportsMultipleQueries { get; }

src/NHibernate/Loader/Loader.cs

@@ -1206,7 +1206,7 @@ protected internal virtual DbCommand PrepareQueryCommand(QueryParameters queryPa
 
 				IDriver driver = _factory.ConnectionProvider.Driver;
 				driver.RemoveUnusedCommandParameters(command, sqlString);
-				driver.ExpandQueryParameters(command, sqlString);
+				driver.ExpandQueryParameters(command, sqlString, sqlCommand.ParameterTypes);
 			}
 			catch (HibernateException)
 			{