Pass null to converter functions

seesharper · May 31, 2023 · 6a22c0d · 6a22c0d
1 parent 1ddab8f
commit 6a22c0d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -60,7 +60,7 @@
       "type": "process",
       "args": [
         "script",
-        "${workspaceFolder}/../build/build.csx",
+        "${workspaceFolder}/build/build.csx",
         "testcoverage"
       ],
       "problemMatcher": "$msCompile",

diff --git a/src/DbReader.Tests/ArgumentParserMethodBuilderTests.cs b/src/DbReader.Tests/ArgumentParserMethodBuilderTests.cs
@@ -44,12 +44,23 @@ public void ShouldHandleEnumWithConverterFunction()
         [Fact]
         public void ShouldHandleNullableEnumWithoutConverterFunctionPassingNull()
         {
-            var args = new { Status = new EnumParameterWithoutConverterFunction?() };
+            //var args = new { EnumParameterWithoutConverterFunctionStatus = (EnumParameterWithoutConverterFunction?)null };
+            var args = new Args() { Status = null };
             var method = argumentParserMethodBuilder.CreateMethod("@Status", args.GetType(), Array.Empty<IDataParameter>());
             var result = method("@Status", args, () => new TestDataParameter());
             result.Parameters[0].Value.ShouldBe(DBNull.Value);
         }
 
+        [Fact]
+        public void ShouldHandleNullableEnumWithConverterFunctionPassingNull()
+        {
+            DbReaderOptions.WhenPassing<EnumParameterWithConverterFunctionPassingNull?>().Use((parameter, value) => parameter.Value = (int)EnumParameterWithConverterFunctionPassingNull.Value3);
+            var args = new { Status = (EnumParameterWithConverterFunctionPassingNull?)null };
+            var method = argumentParserMethodBuilder.CreateMethod("@Status", args.GetType(), Array.Empty<IDataParameter>());
+            var result = method("@Status", args, () => new TestDataParameter());
+            result.Parameters[0].Value.ShouldBe(3);
+        }
+
         [Fact]
         public void ShouldHandleNullableEnumWithoutConverterFunction()
         {
@@ -118,6 +129,15 @@ public class ThrowingDataParameter : IDataParameter
             public DataRowVersion SourceVersion { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
             public object Value { get => throw new NotImplementedException(); set => throw new ArgumentException(); }
         }
+
+        public enum EnumParameterWithConverterFunctionPassingNull
+        {
+            Value1 = 1,
+            Value2 = 2,
+            Value3 = 3
+        }
+
+
         public enum EnumParameterWithoutConverterFunction
         {
             Value1 = 1,
@@ -131,7 +151,12 @@ public enum EnumParameterWithConverterFunction
             Value2 = 2,
             Value3 = 3
         }
+        public class Args
+        {
+            public EnumParameterWithoutConverterFunction? Status { get; set; }
+        }
     }
 
 
+
 }
diff --git a/src/DbReader/ArgumentProcessor.cs b/src/DbReader/ArgumentProcessor.cs
@@ -34,7 +34,7 @@ static ArgumentProcessor()
             ProcessDelegates.TryAdd(typeof(byte), (parameter, value) => AssignParameterValue(parameter, (byte)value));
             ProcessDelegates.TryAdd(typeof(short), (parameter, value) => AssignParameterValue(parameter, (short)value));
             ProcessDelegates.TryAdd(typeof(ushort), (parameter, value) => AssignParameterValue(parameter, (ushort)value));
-            ProcessDelegates.TryAdd(typeof(ushort), (parameter, value) => AssignParameterValue(parameter, (ushort)value));            
+            ProcessDelegates.TryAdd(typeof(ushort), (parameter, value) => AssignParameterValue(parameter, (ushort)value));
         }
 
 
@@ -75,7 +75,7 @@ public static void RegisterProcessDelegate<TArgument>(Action<IDataParameter, TAr
 
         public static void Process(Type argumentType, IDataParameter dataParameter, object argument)
         {
-            if (argument == null)
+            if (argument == null && !ProcessDelegates.ContainsKey(argumentType))
             {
                 dataParameter.Value = DBNull.Value;
                 return;