Improve EFTableRowsDataReader

VahidN · Mar 30, 2020 · 89324c6 · 89324c6
1 parent 9e41b24
commit 89324c6
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 9 deletions.
diff --git a/src/EFCoreSecondLevelCacheInterceptor/EFCoreSecondLevelCacheInterceptor.csproj b/src/EFCoreSecondLevelCacheInterceptor/EFCoreSecondLevelCacheInterceptor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Entity Framework Core Second Level Caching Library.</Description>
-    <VersionPrefix>1.3.1</VersionPrefix>
+    <VersionPrefix>1.3.2</VersionPrefix>
     <Authors>Vahid Nasiri</Authors>
     <TargetFrameworks>netstandard2.0;net461;</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFrameworks>

diff --git a/src/EFCoreSecondLevelCacheInterceptor/EFTableRowsDataReader.cs b/src/EFCoreSecondLevelCacheInterceptor/EFTableRowsDataReader.cs
@@ -127,11 +127,17 @@ public override bool Read()
         public override bool GetBoolean(int ordinal)
         {
             var value = GetValue(ordinal);
-            if (value.GetType() == typeof(long))
+            var valueType = value.GetType();
+            if (valueType == typeof(long))
             {
                 return (long)value != 0;
             }
 
+            if (valueType == typeof(ulong))
+            {
+                return (ulong)value != 0;
+            }
+
             return (bool)value;
         }
 
@@ -190,9 +196,9 @@ public override char GetChar(int ordinal)
         public override DateTime GetDateTime(int ordinal)
         {
             var value = GetValue(ordinal);
-            if (value.GetType() == typeof(string))
+            if (value.GetType() != typeof(DateTime))
             {
-                return DateTime.Parse(value.ToString(), CultureInfo.InvariantCulture);
+                return DateTime.Parse(value.ToString());
             }
 
             return (DateTime)value;
@@ -234,11 +240,17 @@ public override decimal GetDecimal(int ordinal)
         public override float GetFloat(int ordinal)
         {
             var value = GetValue(ordinal);
-            if (value.GetType() == typeof(double))
+            var valueType = value.GetType();
+            if (valueType == typeof(double))
             {
                 return (float)(double)value;
             }
 
+            if (valueType != typeof(float))
+            {
+                return (float)Convert.ChangeType(value, typeof(float));
+            }
+
             return (float)value;
         }
 
@@ -262,11 +274,17 @@ public override Guid GetGuid(int ordinal)
         public override short GetInt16(int ordinal)
         {
             var value = GetValue(ordinal);
-            if (value.GetType() == typeof(long))
+            var valueType = value.GetType();
+            if (valueType == typeof(long))
             {
                 return (short)(long)value;
             }
 
+            if (valueType != typeof(short))
+            {
+                return (short)Convert.ChangeType(value, typeof(short));
+            }
+
             return (short)value;
         }
 
@@ -276,11 +294,17 @@ public override short GetInt16(int ordinal)
         public override int GetInt32(int ordinal)
         {
             var value = GetValue(ordinal);
-            if (value.GetType() == typeof(long))
+            var valueType = value.GetType();
+            if (valueType == typeof(long))
             {
                 return (int)(long)value;
             }
 
+            if (valueType != typeof(int))
+            {
+                return (int)Convert.ChangeType(value, typeof(int));
+            }
+
             return (int)value;
         }
 

diff --git a/src/Tests/Issues/Issue12MySQL/appsettings.json b/src/Tests/Issues/Issue12MySQL/appsettings.json
@@ -9,7 +9,7 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "ApplicationDbContextConnection": "server=localhost;port=3306;user=root;password=MySql-1399#1;database=Issue12MySQL;TreatTinyAsBoolean=true"
+    "ApplicationDbContextConnection": "server=localhost;port=3306;user=root;password=MySql-1399#1;database=Issue12MySQL;TreatTinyAsBoolean=true;AllowZeroDateTime=true;ConvertZeroDateTime=true;"
   },
   "RedisConfiguration": "localhost:6379"
 }
diff --git a/tag-it.bat b/tag-it.bat
@@ -1,3 +1,3 @@
-git tag -a 1.3.1 -m "Published 1.3.1 to nuget.org"
+git tag -a 1.3.2 -m "Published 1.3.2 to nuget.org"
 git push --follow-tags
 pause