Merge pull request #952 from jamescrowley/clearParameters

Author: NickCraver

Dapper/SqlMapper.cs

@@ -1042,6 +1042,8 @@ private static GridReader QueryMultipleImpl(this IDbConnection cnn, ref CommandD
                     }
                     reader.Dispose();
                 }
+
+                cmd?.Parameters.Clear();
                 cmd?.Dispose();
                 if (wasClosed) cnn.Close();
                 throw;
@@ -1122,6 +1124,8 @@ private static IEnumerable<T> QueryImpl<T>(this IDbConnection cnn, CommandDefini
                     reader.Dispose();
                 }
                 if (wasClosed) cnn.Close();
+                
+                cmd?.Parameters.Clear();
                 cmd?.Dispose();
             }
         }
@@ -1212,6 +1216,7 @@ private static T QueryRowImpl<T>(IDbConnection cnn, Row row, ref CommandDefiniti
                     reader.Dispose();
                 }
                 if (wasClosed) cnn.Close();
+                cmd?.Parameters.Clear();
                 cmd?.Dispose();
             }
         }
@@ -1483,6 +1488,7 @@ private static IEnumerable<TReturn> MultiMapImpl<TFirst, TSecond, TThird, TFourt
                 }
                 finally
                 {
+                    ownedCommand?.Parameters.Clear();
                     ownedCommand?.Dispose();
                     if (wasClosed) cnn.Close();
                 }
@@ -1553,6 +1559,7 @@ private static IEnumerable<TReturn> MultiMapImpl<TReturn>(this IDbConnection cnn
                 }
                 finally
                 {
+                    ownedCommand?.Parameters.Clear();
                     ownedCommand?.Dispose();
                     if (wasClosed) cnn.Close();
                 }
@@ -2817,6 +2824,7 @@ private static int ExecuteCommand(IDbConnection cnn, ref CommandDefinition comma
             finally
             {
                 if (wasClosed) cnn.Close();
+                cmd?.Parameters.Clear();
                 cmd?.Dispose();
             }
         }
@@ -2844,6 +2852,7 @@ private static T ExecuteScalarImpl<T>(IDbConnection cnn, ref CommandDefinition c
             finally
             {
                 if (wasClosed) cnn.Close();
+                cmd?.Parameters.Clear();
                 cmd?.Dispose();
             }
             return Parse<T>(result);
@@ -2867,7 +2876,11 @@ private static IDataReader ExecuteReaderImpl(IDbConnection cnn, ref CommandDefin
             finally
             {
                 if (wasClosed) cnn.Close();
-                if (cmd != null && disposeCommand) cmd.Dispose();
+                if (cmd != null && disposeCommand)
+                {
+                    cmd.Parameters.Clear();
+                    cmd.Dispose();
+                }
             }
         }
 

tests/Dapper.Tests/ParameterTests.cs

@@ -26,7 +26,7 @@ public sealed class MicrosoftSqlClientParameterTests : ParameterTests<MicrosoftS
 #endif
     public abstract class ParameterTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider
     {
-        public class DbParams : SqlMapper.IDynamicParameters, IEnumerable<IDbDataParameter>
+        public class DbDynamicParams : SqlMapper.IDynamicParameters, IEnumerable<IDbDataParameter>
         {
             private readonly List<IDbDataParameter> parameters = new List<IDbDataParameter>();
             public IEnumerator<IDbDataParameter> GetEnumerator() { return parameters.GetEnumerator(); }
@@ -42,6 +42,21 @@ void SqlMapper.IDynamicParameters.AddParameters(IDbCommand command, SqlMapper.Id
                     command.Parameters.Add(parameter);
             }
         }
+        
+        public class DbCustomParam : SqlMapper.ICustomQueryParameter
+        {
+            private readonly IDbDataParameter _sqlParameter;
+
+            public DbCustomParam(IDbDataParameter sqlParameter)
+            {
+                _sqlParameter = sqlParameter;
+            }
+
+            public void AddParameter(IDbCommand command, string name)
+            {
+                command.Parameters.Add(_sqlParameter);
+            }
+        }
 
         private static IEnumerable<IDataRecord> CreateSqlDataRecordList(IDbCommand command, IEnumerable<int> numbers)
         {
@@ -799,9 +814,9 @@ public class HazSqlHierarchy
 #endif
 
         [Fact]
-        public void TestCustomParameters()
+        public void TestDynamicParameters()
         {
-            var args = new DbParams {
+            var args = new DbDynamicParams {
                 Provider.CreateRawParameter("foo", 123),
                 Provider.CreateRawParameter("bar", "abc")
             };
@@ -811,7 +826,53 @@ public void TestCustomParameters()
             Assert.Equal(123, foo);
             Assert.Equal("abc", bar);
         }
+        
+        [Fact]
+        public void TestDynamicParametersReuse()
+        {
+            var args = new DbDynamicParams {
+                Provider.CreateRawParameter("foo", 123),
+                Provider.CreateRawParameter("bar", "abc")
+            };
+            var result1 = connection.Query("select Foo=@foo, Bar=@bar", args).Single();
+            var result2 = connection.Query("select Foo=@foo, Bar=@bar", args).Single();
+            Assert.Equal(123, result1.Foo);
+            Assert.Equal("abc", result1.Bar);
+            Assert.Equal(123, result2.Foo);
+            Assert.Equal("abc", result2.Bar);
+        }
 
+        
+        [Fact]
+        public void TestCustomParameter()
+        {
+            var args = new {
+                foo = new DbCustomParam(Provider.CreateRawParameter("foo", 123)),
+                bar = "abc"
+            };
+            var result = connection.Query("select Foo=@foo, Bar=@bar", args).Single();
+            int foo = result.Foo;
+            string bar = result.Bar;
+            Assert.Equal(123, foo);
+            Assert.Equal("abc", bar);
+        }
+        
+        [Fact]
+        public void TestCustomParameterReuse()
+        {
+            var args = new {
+                foo = new DbCustomParam(Provider.CreateRawParameter("foo", 123)),
+                bar = "abc"
+            };
+            var result1 = connection.Query("select Foo=@foo, Bar=@bar", args).Single();
+            var result2 = connection.Query("select Foo=@foo, Bar=@bar", args).Single();
+            Assert.Equal(123, result1.Foo);
+            Assert.Equal("abc", result1.Bar);
+            Assert.Equal(123, result2.Foo);
+            Assert.Equal("abc", result2.Bar);
+        }
+        
+        
         [Fact]
         public void TestDynamicParamNullSupport()
         {