Fix reading scalar enums

Author: mythz

src/ServiceStack.OrmLite/Converters/SpecialConverters.cs

@@ -38,6 +38,15 @@ public override object ToDbValue(Type fieldType, object value)
 
             return enumValue;
         }
+
+        public override object FromDbValue(Type fieldType, object value)
+        {
+            var strVal = value as string;
+            if (strVal != null)
+                return Enum.Parse(fieldType, strVal, ignoreCase:true);
+
+            return Convert.ChangeType(value, fieldType.GetTypeCode());
+        }
     }
 
     public class RowVersionConverter : OrmLiteConverter

src/ServiceStack.OrmLite/OrmLiteReadCommandExtensions.cs

@@ -680,7 +680,7 @@ internal static T ToScalar<T>(IOrmLiteDialectProvider dialectProvider, IDataRead
             if (underlyingType == typeof(object))
                 return (T)reader.GetValue(0);
 
-            var converter = dialectProvider.GetConverter(underlyingType);
+            var converter = dialectProvider.GetConverterBestMatch(underlyingType);
             if (converter != null)
             {
                 object oValue = converter.GetValue(reader, columnIndex);

tests/ServiceStack.OrmLite.Tests/EnumTests.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using ServiceStack.DataAnnotations;
 using ServiceStack.Text;
 
 namespace ServiceStack.OrmLite.Tests
@@ -278,6 +279,44 @@ public void Can_Select_Type_with_Nullable_Enum()
                 Assert.That(row.Id, Is.EqualTo(2));
             }
         }
+
+        [Test]
+        public void Can_get_Scalar_Enum()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<TypeWithEnum>();
+
+                var row = new TypeWithEnum { Id = 1, EnumValue = SomeEnum.Value2 };
+                db.Insert(row);
+
+                var someEnum = db.Scalar<SomeEnum>(db.From<TypeWithEnum>()
+                    .Where(o => o.Id == row.Id)
+                    .Select(o => o.EnumValue));
+
+                Assert.That(someEnum, Is.EqualTo(SomeEnum.Value2));
+            }
+        }
+
+        [Test]
+        public void Can_get_Scalar_Enum_Flag()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<TypeWithFlagsEnum>();
+
+                var row = new TypeWithFlagsEnum { Id = 1, Flags = FlagsEnum.FlagTwo };
+                db.Insert(row);
+
+                row.PrintDump();
+
+                var flagsEnum = db.Scalar<FlagsEnum>(db.From<TypeWithFlagsEnum>()
+                    .Where(o => o.Id == row.Id)
+                    .Select(o => o.Flags));
+
+                Assert.That(flagsEnum, Is.EqualTo(FlagsEnum.FlagTwo));
+            }
+        }
     }