Allow certain types to not participate in IEnumerable expansion #636

schotime · Dec 29, 2023 · 1600540 · 1600540
1 parent 81e80e7
commit 1600540
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/NPoco.Abstractions/ParameterHelper.cs b/src/NPoco.Abstractions/ParameterHelper.cs
@@ -12,6 +12,8 @@ namespace NPoco
 {
     public class ParameterHelper
     {
+        public static List<Type> ExcludedIEnumerableTypes = new();
+
         // Helper to handle named parameters from object properties
         public static Regex rxParamsPrefix = new Regex(@"(?<!@)@\w+", RegexOptions.Compiled);
 
@@ -92,7 +94,8 @@ private static string ProcessParam(ref string sql, string rawParam, object[] arg
             // Expand collections to parameter lists
             if ((arg_val as System.Collections.IEnumerable) != null &&
                 (arg_val as string) == null &&
-                (arg_val as byte[]) == null)
+                (arg_val as byte[]) == null &&
+                !ExcludedIEnumerableTypes.Contains(arg_val.GetTheType()))
             {
                 var sb = new StringBuilder();
                 foreach (var i in arg_val as System.Collections.IEnumerable)

diff --git a/test/NPoco.Tests/ParameterHelper.cs b/test/NPoco.Tests/ParameterHelper.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
 using NUnit.Framework;
 
 namespace NPoco.Tests
@@ -118,5 +119,20 @@ public void RewriteTheSameParameters()
             Assert.AreEqual(2, args.Count);
             Assert.AreEqual(resultSql, "SELECT * FROM test WHERE testID in (@0, @1, @0, @0, @1)");
         }
+
+        [Test]
+        public void ExludedIEnumerableTypeParameters()
+        {
+            var sql = "UPDATE test SET name = @0, data = @1 WHERE id = @2";
+            var args = new List<object>();
+            var data = JToken.Parse("{\"Test\":\"Test\",\"Quantity\":5}");
+            var args_src = new object[] { "test", data, Guid.NewGuid() };
+            ParameterHelper.ExcludedIEnumerableTypes.AddRange(new[] { typeof(JToken), typeof(JObject) });
+            var resultSql = ParameterHelper.ProcessParams(sql, args_src, args);
+
+            Assert.AreEqual(3, args.Count);
+            Assert.AreEqual(resultSql, "UPDATE test SET name = @0, data = @1 WHERE id = @2");
+            ParameterHelper.ExcludedIEnumerableTypes.Clear();
+        }
     }
 }