Use EnumConverter definition for creating enum properties

ServiceStack · Nov 18, 2016 · 9373ef2 · 9373ef2
1 parent fd8cc1d
commit 9373ef2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs b/src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs
@@ -142,8 +142,10 @@ public string GetColumnTypeDefinition(Type columnType, int? fieldLength, int? sc
             }
 
             var stringConverter = columnType.IsRefType()
-                ? (IHasColumnDefinitionLength)ReferenceTypeConverter
-                : ValueTypeConverter;
+                ? ReferenceTypeConverter
+                : columnType.IsEnum()
+                    ? EnumConverter
+                    : (IHasColumnDefinitionLength)ValueTypeConverter;
 
             return stringConverter.GetColumnDefinition(fieldLength);
         }

diff --git a/tests/ServiceStack.OrmLite.Tests/OrmLiteCreateTableWithIndexesTests.cs b/tests/ServiceStack.OrmLite.Tests/OrmLiteCreateTableWithIndexesTests.cs
@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using ServiceStack.Text;
 using ServiceStack.Common.Tests.Models;
+using ServiceStack.Logging;
 
 namespace ServiceStack.OrmLite.Tests
 {
@@ -123,5 +124,13 @@ public void Can_create_ModelWithNamedCompositeIndex_table()
             }
         }
 
+        [Test]
+        public void Can_create_CompositeIndex_with_Enum()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<ModelWithEnum>();
+            }
+        }
     }
 }
diff --git a/tests/ServiceStack.OrmLite.Tests/Shared/ModelWithCompositeIndexFields.cs b/tests/ServiceStack.OrmLite.Tests/Shared/ModelWithCompositeIndexFields.cs
@@ -49,4 +49,18 @@ public class ModelWithCompositeIndexOnFieldSpacesDesc
         [Alias("Field WithSpace2")]
         public string FieldWithSpace2 { get; set; }
     }
+
+    [CompositeIndex(true, nameof(UserId), nameof(UserRole))]
+    public class ModelWithEnum
+    {
+        public long Id { get; set; }
+        public long UserId { get; set; }
+        public UserRoleEnum UserRole { get; set; }
+    }
+
+    public enum UserRoleEnum
+    {
+        User,
+        Admin
+    }
 }