Merge pull request #60 from seesharper/do-not-call-convert-on-null

Don't call ArgumentProcessor when value is null
seesharper · Sep 1, 2022 · 68d1bc5 · 68d1bc5
2 parents 9a3aee6 + c67e93e
commit 68d1bc5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/src/DbReader.Tests/IntegrationTests.cs b/src/DbReader.Tests/IntegrationTests.cs
@@ -495,6 +495,18 @@ public async Task ShouldHandlePassingNullableCustomValueTypeWithValue()
             }
         }
 
+        [Fact]
+        public async Task ShouldHandlePassingNullableCustomValueTypeWithNull()
+        {
+            CustomValueType? shipVia = null;
+
+            using (var connection = CreateConnection())
+            {
+                var count = connection.ExecuteScalar<long>("SELECT COUNT(*) FROM Orders WHERE ShipVia = @ShipVia", new { ShipVia = shipVia });
+                count.ShouldBe(0);
+            }
+        }
+
         [Fact]
         public void ShouldNotSetParameterValueWhenPassingCustomType()
         {

diff --git a/src/DbReader/ArgumentProcessor.cs b/src/DbReader/ArgumentProcessor.cs
@@ -42,7 +42,14 @@ public static void RegisterProcessDelegate<TArgument>(Action<IDataParameter, TAr
 
         public static void Process(Type argumentType, IDataParameter dataParameter, object argument)
         {
-            ProcessDelegates[argumentType.GetUnderlyingType()](dataParameter, argument);
+            if (argument != null)
+            {
+                ProcessDelegates[argumentType.GetUnderlyingType()](dataParameter, argument);
+            }
+            else
+            {
+                dataParameter.Value = DBNull.Value;
+            }
         }
 
         public static bool CanProcess(Type type)

diff --git a/src/DbReader/DbReader.csproj b/src/DbReader/DbReader.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;netstandard2.0;net462</TargetFrameworks>
-    <Version>2.5.3</Version>
+    <Version>2.5.4</Version>
     <Authors>Bernhard Richter</Authors>
     <PackageProjectUrl>https://github.com/seesharper/DbReader</PackageProjectUrl>
     <RepositoryType>git</RepositoryType>