Merge pull request #179 from matwilko/idictionary-fix

Allow passing an IDictionary<string, object> as parameter object
DapperLib · Sep 22, 2014 · 5abf74f · 5abf74f
2 parents dc17868 + d2cce62
commit 5abf74f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/Dapper NET40/SqlMapper.cs b/Dapper NET40/SqlMapper.cs
@@ -2048,17 +2048,19 @@ private static CacheInfo GetCacheInfo(Identity identity, object exampleParameter
                     {
                         info.ParamReader = (cmd, obj) => { ((IDynamicParameters)obj).AddParameters(cmd, identity); };
                     }
-#if !CSHARP30
-                    // special-case dictionary && `dynamic`
-                    else if (exampleParameters is IEnumerable<KeyValuePair<string, object>> && exampleParameters is System.Dynamic.IDynamicMetaObjectProvider)
+#if CSHARP30
+                    else if (exampleParameters is IEnumerable<KeyValuePair<string, object>>)
+#else
+                    // special-case dictionary and `dynamic`
+                    else if (exampleParameters is IEnumerable<KeyValuePair<string, object>> || exampleParameters is System.Dynamic.IDynamicMetaObjectProvider)
+#endif
                     {
                         info.ParamReader = (cmd, obj) =>
                         {
                             IDynamicParameters mapped = new DynamicParameters(obj);
                             mapped.AddParameters(cmd, identity);
                         };
                     }
-#endif
                     else
                     {
                         var literals = GetLiteralTokens(identity.sql);

diff --git a/Tests/Tests.cs b/Tests/Tests.cs
@@ -3842,6 +3842,15 @@ public void SO25297173_DynamicIn()
             result.Contains(6).IsTrue();
         }
 
+        public void AllowIDictionaryParameters()
+        {
+            var parameters = new Dictionary<string, object>
+            {
+                { "param1", 0 }
+            };
+
+            connection.Query("SELECT @param1", parameters);
+        }
 #if POSTGRESQL
 
         class Cat