Fix NH-2257 (Parameter ordering not working when driver does not support Named Parameters)

SVN: trunk@5073

Author: FlukeFan

src/NHibernate.Test/NHSpecificTest/NH2257/Domain.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH2257
+{
+	public class Foo
+	{
+		public virtual int Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual int Ord { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH2257/Fixture.cs

@@ -0,0 +1,30 @@
+using System.Linq;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH2257
+{
+	public class Fixture : BugTestCase
+	{
+		protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect)
+		{
+			return (dialect is NHibernate.Dialect.InformixDialect1000);
+		}
+
+		[Test]
+		public void InformixUsingDuplicateParameters()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.Save(new Foo() { Name = "aa" });
+
+				var list =
+					session.CreateQuery("from Foo f where f.Name = :p1 and not f.Name <> :p1")
+						.SetParameter("p1", "aa")
+						.List<Foo>();
+
+				Assert.That(list.Count, Is.EqualTo(1));
+			}
+		}
+	}
+}

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+                   assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH2257">
+
+  <class name="Foo">
+    <id name="Id">
+      <generator class="hilo" />
+    </id>
+		<property name="Name"/>
+		<property name="Ord"/>
+	</class>
+</hibernate-mapping>

src/NHibernate.Test/NHibernate.Test.csproj

@@ -774,6 +774,8 @@
     <Compile Include="NHSpecificTest\NH2243\Person.cs" />
     <Compile Include="NHSpecificTest\NH2251\Domain.cs" />
     <Compile Include="NHSpecificTest\NH2251\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH2257\Domain.cs" />
+    <Compile Include="NHSpecificTest\NH2257\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH473\Child.cs" />
     <Compile Include="NHSpecificTest\NH473\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH473\Parent.cs" />
@@ -2215,6 +2217,7 @@
     <EmbeddedResource Include="DriverTest\SqlServerCeEntity.hbm.xml" />
     <EmbeddedResource Include="CollectionTest\NullableValueTypeElementMapFixture.hbm.xml" />
     <Content Include="DynamicEntity\package.html" />
+    <EmbeddedResource Include="NHSpecificTest\NH2257\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2208\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2251\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2041\Mappings.hbm.xml" />

src/NHibernate/AdoNet/AbstractBatcher.cs

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

src/NHibernate/Driver/DriverBase.cs

@@ -208,6 +208,36 @@ public IDbDataParameter GenerateParameter(IDbCommand command, string name, SqlTy
 			return dbParam;
 		}
 
+		public virtual void ExpandQueryParameters(IDbCommand cmd, SqlString sqlString)
+		{
+			if (UseNamedPrefixInSql)
+				return;  // named parameters are ok
+
+			var expandedParameters = new List<IDbDataParameter>();
+			foreach (object part in sqlString.Parts)
+			{
+				if (part is Parameter)
+				{
+					var parameter = (Parameter)part;
+					var originalParameter = (IDbDataParameter)cmd.Parameters[parameter.ParameterPosition.Value];
+					expandedParameters.Add(CloneParameter(cmd, originalParameter));
+				}
+			}
+
+			cmd.Parameters.Clear();
+			foreach (var parameter in expandedParameters)
+				cmd.Parameters.Add(parameter);
+		}
+
+		protected virtual IDbDataParameter CloneParameter(IDbCommand cmd, IDbDataParameter originalParameter)
+		{
+			var clone = cmd.CreateParameter();
+			clone.DbType = originalParameter.DbType;
+			clone.ParameterName = originalParameter.ParameterName;
+			clone.Value = originalParameter.Value;
+			return clone;
+		}
+
 		public void PrepareCommand(IDbCommand command)
 		{
 			OnBeforePrepare(command);

src/NHibernate/Driver/IDriver.cs

@@ -95,5 +95,16 @@ public interface IDriver
 		/// <param name="sqlType">The SqlType to set for IDbDataParameter.</param>
 		/// <returns>An IDbDataParameter ready to be added to an IDbCommand.</returns>
 		IDbDataParameter GenerateParameter(IDbCommand command, string name, SqlType sqlType);
+
+		/// <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);
 	}
 }

src/NHibernate/Engine/IBatcher.cs

@@ -131,6 +131,17 @@ public interface IBatcher : IDisposable
 		/// </remarks>
 		int ExecuteNonQuery(IDbCommand cmd);
 
+		/// <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

@@ -1148,6 +1148,8 @@ protected internal virtual IDbCommand PrepareQueryCommand(QueryParameters queryP
 					BindLimitParameters(command, colIndex, selection, session);
 				}
 
+				session.Batcher.ExpandQueryParameters(command, sqlString);
+
 				if (!useLimit)
 				{
 					SetMaxRows(command, selection);