Skip to content

Added enum to int conversion for unmapped side of binary expressions #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 13, 2023
Merged

Added enum to int conversion for unmapped side of binary expressions #163

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
14b3626
Added enum to int conversion for unmapped side of binary expressions
ErikGjers Feb 11, 2023
8ce9f43
Enum to int conversion logic from VisitBinary to VisitConstant.
ErikGjers Feb 16, 2023
0cde2e7
new test start
erikgjchalmers Mar 2, 2023
3104e1d
Made tests using Theory
Mar 2, 2023
615ffce
Removed string-enum mapping
Mar 2, 2023
1946f01
Logic already in VisitMember solves the same problem - should be safe…
BlaiseD Mar 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Enum to int conversion logic from VisitBinary to VisitConstant.
  • Loading branch information
@ErikGjers
ErikGjers committed Feb 16, 2023
commit 8ce9f43c026b656573d921edac125a1eeea23daf
9 changes: 9 additions & 0 deletions src/AutoMapper.Extensions.ExpressionMapping/Extensions/VisitorExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using AutoMapper.Extensions.ExpressionMapping.Structures;
using AutoMapper.Internal;

namespace AutoMapper.Extensions.ExpressionMapping.Extensions
{
Expand Down Expand Up @@ -202,5 +203,13 @@ public static List<Type> GetUnderlyingGenericTypes(this Type type) =>
type == null || !type.GetTypeInfo().IsGenericType
? new List<Type>()
: type.GetGenericArguments().ToList();

public static bool IsEnumType(this Type type)
{
if (type.IsNullableType())
type = Nullable.GetUnderlyingType(type);

return type.IsEnum();
}
}
}
17 changes: 6 additions & 11 deletions src/AutoMapper.Extensions.ExpressionMapping/XpressionMapperVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,17 +431,6 @@ Expression DoVisitBinary(Expression newLeft, Expression newRight, Expression con
{
if (newLeft != node.Left || newRight != node.Right || conversion != node.Conversion)
{
if(node.Left.Type.IsEnum && node.Right.Type.IsEnum)
{
if (newLeft.Type.IsEnum && !newRight.Type.IsEnum)
{
newLeft = Expression.Convert(newLeft, newRight.Type);
}
else if (!newLeft.Type.IsEnum && newRight.Type.IsEnum)
{
newRight = Expression.Convert(newRight, newLeft.Type);
}
}
if (node.NodeType == ExpressionType.Coalesce && node.Conversion != null)
return Expression.Coalesce(newLeft, newRight, conversion as LambdaExpression);
else
Expand Down Expand Up @@ -530,10 +519,16 @@ protected override Expression VisitConstant(ConstantExpression node)

if (ConfigurationProvider.CanMapConstant(node.Type, newType))
return base.VisitConstant(Expression.Constant(Mapper.MapObject(node.Value, node.Type, newType), newType));

else if (BothEnumOrLiteral())
return node.ConvertTypeIfNecessary(newType);
//Issue 3455 (Non-Generic Mapper.Map failing for structs in v10)
//return base.VisitConstant(Expression.Constant(Mapper.Map(node.Value, node.Type, newType), newType));
}
return base.VisitConstant(node);

bool BothEnumOrLiteral()
=> (node.Type.IsLiteralType() || node.Type.IsEnumType()) && (newType.IsLiteralType() || newType.IsEnumType());
}

protected override Expression VisitMethodCall(MethodCallExpression node)
Expand Down