Merge pull request #56 from seesharper/quick-fix-propertyvalidator

User underlying type when validating nullable properties
seesharper · Mar 29, 2022 · a6041a8 · a6041a8
2 parents 2de6ae1 + e653697
commit a6041a8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -13,12 +13,12 @@ variables:
 - group: api-keys
 
 pool:
-  name: Hosted Ubuntu 1604
+  vmImage: 'ubuntu-latest'
 steps:
 - bash: 'sudo apt install nuget'
   displayName: 'Install NuGet'
 - bash: |
-   curl -L https://github.com/filipw/dotnet-script/releases/download/0.28.0/dotnet-script.0.28.0.zip > dotnet-script.zip
+   curl -L https://github.com/filipw/dotnet-script/releases/download/1.3.1/dotnet-script.1.3.1.zip > dotnet-script.zip
    unzip -o dotnet-script.zip -d ./
   displayName: 'Install latest otnet-script'
 

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

diff --git a/src/DbReader/Mapping/PropertyTypeValidator.cs b/src/DbReader/Mapping/PropertyTypeValidator.cs
@@ -41,14 +41,10 @@ public MappingInfo[] Execute(Type type, IDataRecord dataRecord, string prefix)
                 }
 
                 var propertyType = mappingInfo.Property.PropertyType;
-                // if (propertyType.IsEnum)
-                // {
-                //     propertyType = propertyType.GetUnderlyingType();
-                // }
 
                 if (!propertyType.IsAssignableFrom(mappingInfo.ColumnInfo.Type.GetTypeInfo()) && !ValueConverter.CanConvert(propertyType))
                 {
-                    if (propertyType.IsEnum)
+                    if (propertyType.IsEnum || propertyType.IsNullable())
                     {
                         Execute(propertyType.GetUnderlyingType(), dataRecord, prefix);
                     }