Merge pull request #527 from CormacBrennan-AI/master

Add logic to handle EnumAsInt attribute for Oracle databases

Author: mythz

src/ServiceStack.OrmLite.Oracle/Converters/OracleEnumConverter.cs

@@ -1,4 +1,5 @@
 using System;
+using ServiceStack.DataAnnotations;
 using ServiceStack.OrmLite.Converters;
 
 namespace ServiceStack.OrmLite.Oracle.Converters
@@ -7,6 +8,11 @@ public class OracleEnumConverter : EnumConverter
     {
         public override string ToQuotedString(Type fieldType, object value)
         {
+            if (fieldType.HasAttribute<EnumAsIntAttribute>())
+            {
+                return this.ConvertNumber(fieldType.GetEnumUnderlyingType(), value).ToString();
+            }
+
             if (value is int && !fieldType.IsEnumFlags())
             {
                 value = fieldType.GetEnumName(value);
@@ -33,6 +39,15 @@ public override object ToDbValue(Type fieldType, object value)
                 value = fieldType.GetEnumName(value);
             }
 
+            if (fieldType.HasAttribute<EnumAsIntAttribute>())
+            {
+                if (value is string)
+                {
+                    value = Enum.Parse(fieldType, value.ToString());
+                }
+                return (int) value;
+            }
+
             var enumValue = DialectProvider.StringSerializer.SerializeToString(value);
             // Oracle stores empty strings in varchar columns as null so match that behavior here
             if (enumValue == null)
@@ -42,5 +57,19 @@ public override object ToDbValue(Type fieldType, object value)
                 ? null
                 : enumValue;
         }
+
+        public override object FromDbValue(Type fieldType, object value)
+        {
+            return base.FromDbValue(fieldType, GetDbValue(fieldType, value));
+        }
+
+        private static object GetDbValue(Type fieldType, object value)
+        {
+            if (!fieldType.IsEnum) return value;
+
+            var oracleValue = value as OracleValue;
+
+            return oracleValue == null ? value : Convert.ToInt32(value);
+        }
     }
 }

src/ServiceStack.OrmLite.Oracle/OracleOrmLiteDialectProvider.cs

@@ -7,6 +7,7 @@
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
+using ServiceStack.DataAnnotations;
 using ServiceStack.OrmLite.Converters;
 using ServiceStack.OrmLite.Oracle.Converters;
 using ServiceStack.Text;
@@ -426,7 +427,7 @@ public override object ToDbValue(object value, Type type)
             if (value == null || value is DBNull)
                 return null;
 
-            if (type.IsEnum)
+            if (type.IsEnum && !type.HasAttribute<EnumAsIntAttribute>())
                 return EnumConverter.ToDbValue(type, value);
 
             if (type.IsRefType())