Change how we read numeric values to handle coercions to different number types

Author: mythz

src/ServiceStack.OrmLite.Oracle.Tests/ServiceStack.OrmLite.Oracle.Tests.csproj

@@ -198,6 +198,9 @@
     <Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\OrmLiteUtilExtensionsTests.cs">
       <Link>OrmLiteUtilExtensionsTests.cs</Link>
     </Compile>
+    <Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\PerfTests.cs">
+      <Link>PerfTests.cs</Link>
+    </Compile>
     <Compile Include="..\..\tests\ServiceStack.OrmLite.Tests\Shared\ApiUtilExtensions.cs">
       <Link>Shared\ApiUtilExtensions.cs</Link>
     </Compile>

src/ServiceStack.OrmLite/OrmLiteReadExtensions.cs

@@ -81,17 +81,35 @@ public static GetValueDelegate GetValueFn<T>(IDataRecord reader)
                     case TypeCode.Boolean:
                         return i => reader.GetBoolean(i);
                     case TypeCode.Int16:
-                        return i => reader.GetInt16(i);
                     case TypeCode.Int32:
-                        return i => reader.GetInt32(i);
                     case TypeCode.Int64:
-                        return i => reader.GetInt64(i);
                     case TypeCode.Single:
-                        return i => reader.GetFloat(i);
                     case TypeCode.Double:
-                        return i => reader.GetDouble(i);
                     case TypeCode.Decimal:
-                        return i => reader.GetDecimal(i);
+                        return i =>
+                        {
+                            var value = reader.GetValue(i);
+                            if (value is T)
+                                return value;
+
+                            switch (typeCode)
+                            {
+                                case TypeCode.Int16:
+                                    return Convert.ToInt16(value);
+                                case TypeCode.Int32:
+                                    return Convert.ToInt32(value);
+                                case TypeCode.Int64:
+                                    return Convert.ToInt16(value);
+                                case TypeCode.Single:
+                                    return Convert.ToSingle(value);
+                                case TypeCode.Double:
+                                    return Convert.ToDouble(value);
+                                case TypeCode.Decimal:
+                                    return Convert.ToDecimal(value);
+                                default:
+                                    return value;
+                            }
+                        };
                     case TypeCode.DateTime:
                         return i => reader.GetDateTime(i);
                 }

tests/ServiceStack.OrmLite.Tests/OrmLiteSelectTests.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 using NUnit.Framework;
 using ServiceStack.Common;
 using ServiceStack.Common.Tests.Models;
@@ -364,5 +366,27 @@ public void Can_handle_TimeSpans()
             }
         }
 
+	    [Test]
+	    public void Does_return_correct_numeric_values()
+	    {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<ModelWithDifferentNumTypes>();
+
+                var row = ModelWithDifferentNumTypes.Create(1);
+
+                db.Insert(row);
+
+                var fromDb = db.Select<ModelWithDifferentNumTypes>().First();
+
+                Assert.That(row.Short, Is.EqualTo(fromDb.Short));
+                Assert.That(row.Int, Is.EqualTo(fromDb.Int));
+                Assert.That(row.Long, Is.EqualTo(fromDb.Long));
+                Assert.That(row.Float, Is.EqualTo(fromDb.Float));
+                Assert.That(row.Double, Is.EqualTo(fromDb.Double));
+                Assert.That(row.Decimal, Is.EqualTo(fromDb.Decimal));
+            }
+        }
+
 	}
 }

tests/ServiceStack.OrmLite.Tests/PerfTests.cs

@@ -0,0 +1,57 @@
+using System.Diagnostics;
+using NUnit.Framework;
+using ServiceStack.Common.Tests.Models;
+using ServiceStack.DataAnnotations;
+using ServiceStack.Text;
+
+namespace ServiceStack.OrmLite.Tests
+{
+    public class ModelWithDifferentNumTypes
+    {
+        [AutoIncrement]
+        public int Id { get; set; }
+
+        public short Short { get; set; }
+        public int Int { get; set; }
+        public long Long { get; set; }
+        public float Float { get; set; }
+        public double Double { get; set; }
+        public decimal Decimal { get; set; }
+
+        public static ModelWithDifferentNumTypes Create(int i)
+        {
+            return new ModelWithDifferentNumTypes
+            {
+                Short = (short)i,
+                Int = i,
+                Long = i,
+                Float = (float)i * i * .1f,
+                Double = (double)i * i * .1d,
+                Decimal = (decimal)i * i * .1m,
+            };
+        }
+    }
+
+    [TestFixture, Explicit]
+    public class PerfTests : OrmLiteTestBase
+    {
+        [Test] 
+        public void Is_GetValue_Slow()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<ModelWithDifferentNumTypes>();
+
+                100.Times(x =>
+                    db.Insert(ModelWithDifferentNumTypes.Create(x)));
+
+                int count = 0;
+
+                var sw = Stopwatch.StartNew();
+                100.Times(i => count += db.Select<ModelWithDifferentNumTypes>().Count);
+
+                sw.ElapsedMilliseconds.ToString().Print();
+            }
+        }
+    }
+}

tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj

@@ -129,6 +129,7 @@
     <Compile Include="MockAllApiTests.cs" />
     <Compile Include="OrmLiteExecFilterTests.cs" />
     <Compile Include="OrmLiteFiltersTests.cs" />
+    <Compile Include="PerfTests.cs" />
     <Compile Include="StringSerializerTests.cs" />
     <Compile Include="TypeDescriptorMetadataTests.cs" />
     <Compile Include="Shared\ApiUtilExtensions.cs" />