Don't use serialized EnumMember as db values, use enum name instead

Author: mythz

src/ServiceStack.OrmLite/Converters/SpecialConverters.cs

@@ -3,6 +3,8 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Data;
+using System.Reflection;
+using System.Runtime.Serialization;
 using ServiceStack.DataAnnotations;
 #if NETSTANDARD2_0
 using System.Globalization;
@@ -14,7 +16,8 @@ public enum EnumKind
     {
         String,
         Int,
-        Char
+        Char,
+        EnumMember,
     }
 
     public class EnumConverter : StringConverter
@@ -32,7 +35,9 @@ public static EnumKind GetEnumKind(Type enumType)
                 ? EnumKind.Int
                 : enumType.HasAttributeCached<EnumAsCharAttribute>()
                     ? EnumKind.Char
-                    : EnumKind.String;
+                    : HasEnumMembers(enumType) 
+                        ? EnumKind.EnumMember
+                        : EnumKind.String;
 
             Dictionary<Type, EnumKind> snapshot, newCache;
             do
@@ -109,6 +114,9 @@ public override object ToDbValue(Type fieldType, object value)
                 value = Enum.ToObject(fieldType, enumValue);
             }
 
+            if (enumKind == EnumKind.EnumMember) // Don't use serialized Enum Value
+                return value.ToString();
+
             var enumString = DialectProvider.StringSerializer.SerializeToString(value);
             return enumString != null && enumString != "null"
                 ? enumString.Trim('"') 
@@ -141,6 +149,18 @@ public static bool IsIntEnum(Type fieldType)
             return isIntEnum;
         }
 
+        public static bool HasEnumMembers(Type enumType)
+        {
+            var enumMembers = enumType.GetFields(BindingFlags.Public | BindingFlags.Static);
+            foreach (var fi in enumMembers)
+            {
+                var enumMemberAttr = fi.FirstAttribute<EnumMemberAttribute>();
+                if (enumMemberAttr?.Value != null)
+                    return true;
+            }
+            return false;
+        }
+
         public override object FromDbValue(Type fieldType, object value)
         {
             var enumKind = GetEnumKind(fieldType);

tests/ServiceStack.OrmLite.MySql.Tests/EnumTests.cs

@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Runtime.Serialization;
 using NUnit.Framework;
 using ServiceStack.DataAnnotations;
 

tests/ServiceStack.OrmLite.Tests/EnumTests.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 using NUnit.Framework;
 using ServiceStack.DataAnnotations;
 using ServiceStack.Logging;
@@ -453,6 +454,21 @@ public void Can_select_enum_using_tuple()
 
             Assert.That(rows[0].someEnum, Is.EqualTo(SomeEnum.Value2));
         }
+
+        [Test]
+        public void Does_insert_types_with_EnumMembers()
+        {
+            OrmLiteUtils.PrintSql();
+            using var db = OpenDbConnection();
+            db.DropAndCreateTable<TypeWithEnumMember>();
+
+            db.Insert(new TypeWithEnumMember {Id = 1, WorkflowType = WorkflowType.SalesInvoice});
+            db.Insert(new TypeWithEnumMember {Id = 2, WorkflowType = WorkflowType.PurchaseInvoice});
+
+            var results = db.Select<TypeWithEnumMember>().ToDictionary(x => x.Id);
+            Assert.That(results[1].WorkflowType, Is.EqualTo(WorkflowType.SalesInvoice));
+            Assert.That(results[2].WorkflowType, Is.EqualTo(WorkflowType.PurchaseInvoice));
+        }
     }
 
     [EnumAsChar]
@@ -545,4 +561,21 @@ public class TypeWithNullableEnum
         public SomeEnum EnumValue { get; set; }
         public SomeEnum? NullableEnumValue { get; set; }
     }
+    
+    public enum WorkflowType
+    {
+        Unknown,
+        [EnumMember(Value = "Sales Invoices")]
+        SalesInvoice,
+        [EnumMember(Value = "Purchase Invoices")]
+        PurchaseInvoice,
+        [EnumMember(Value = "Supplier Statement")]
+        SupplierStatement
+    }
+
+    public class TypeWithEnumMember
+    {
+        public int Id { get; set; }
+        public WorkflowType WorkflowType { get; set; }
+    }
 }