#624 Fixed the Enum Type Flags Attribute.

mikependon · Oct 27, 2020 · b42cbdf · b42cbdf
1 parent 2aad4d1
commit b42cbdf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/EnumPropertyTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/EnumPropertyTest.cs
@@ -469,7 +469,7 @@ public void TestInsertForEnum()
                 Assert.AreEqual(entity.SessionId, id);
 
                 // Act
-                var queryResult = connection.Query<FlaggedEnumForIntCompleteTable>(id);
+                var queryResult = connection.Query<EnumCompleteTable>(id);
 
                 // Assert
                 Helper.AssertPropertiesEquality(entity, queryResult.First());
@@ -517,7 +517,7 @@ public void TestInsertForEnumAsIntForString()
                 Assert.AreEqual(entity.SessionId, id);
 
                 // Act
-                var queryResult = connection.Query<FlaggedEnumForIntCompleteTable>(id);
+                var queryResult = connection.Query<EnumAsIntForStringCompleteTable>(id);
 
                 // Assert
                 Helper.AssertPropertiesEquality(entity, queryResult.First());

diff --git a/RepoDb.Core/RepoDb/Reflection/Compiler/Compiler.cs b/RepoDb.Core/RepoDb/Reflection/Compiler/Compiler.cs
@@ -653,7 +653,7 @@ internal static Expression ConvertEnumExpressionToTypeExpression(Expression expr
         /// <returns></returns>
         internal static Expression ConvertEnumExpressionToTypeExpressionForString(Expression expression)
         {
-            var method = typeof(Enum).GetMethod("GetName", new[] { StaticType.Type, StaticType.Object });
+            var method = StaticType.Convert.GetMethod("ToString", new[] { StaticType.Object });
 
             // Variables
             var isNullExpression = (Expression)null;
@@ -671,12 +671,8 @@ internal static Expression ConvertEnumExpressionToTypeExpressionForString(Expres
             }
 
             // False
-            var parameters = new Expression[]
-            {
-                Expression.Constant(expression.Type.GetUnderlyingType()),
-                ConvertExpressionToTypeExpression(expression, StaticType.Object)
-            };
-            falseExpression = ConvertExpressionToTypeExpression(Expression.Call(method, parameters), StaticType.String);
+            var methodCallExpression = Expression.Call(method, ConvertExpressionToTypeExpression(expression, StaticType.Object));
+            falseExpression = ConvertExpressionToTypeExpression(methodCallExpression, StaticType.String);
 
             // Call and return
             return isNullExpression == null ? falseExpression :