Skip to content

Fixed selecting int property into enum property #496

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
StefH merged 1 commit into from
Apr 2, 2021
Merged

Fixed selecting int property into enum property #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions src/System.Linq.Dynamic.Core/Parser/TypeHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ public static bool IsCompatibleWith(Type source, Type target)
return false;
}

TypeCode sc = st.GetTypeInfo().IsEnum ? TypeCode.Object : Type.GetTypeCode(st);
TypeCode tc = tt.GetTypeInfo().IsEnum ? TypeCode.Object : Type.GetTypeCode(tt);
TypeCode sc = st.GetTypeInfo().IsEnum ? TypeCode.Int64 : Type.GetTypeCode(st);
TypeCode tc = tt.GetTypeInfo().IsEnum ? TypeCode.Int64 : Type.GetTypeCode(tt);
switch (sc)
{
case TypeCode.SByte:
Expand All @@ -71,6 +71,7 @@ public static bool IsCompatibleWith(Type source, Type target)
return true;
}
break;

case TypeCode.Byte:
switch (tc)
{
Expand All @@ -87,6 +88,7 @@ public static bool IsCompatibleWith(Type source, Type target)
return true;
}
break;

case TypeCode.Int16:
switch (tc)
{
Expand All @@ -99,6 +101,7 @@ public static bool IsCompatibleWith(Type source, Type target)
return true;
}
break;

case TypeCode.UInt16:
switch (tc)
{
Expand All @@ -113,6 +116,7 @@ public static bool IsCompatibleWith(Type source, Type target)
return true;
}
break;

case TypeCode.Int32:
switch (tc)
{
Expand All @@ -124,6 +128,7 @@ public static bool IsCompatibleWith(Type source, Type target)
return true;
}
break;

case TypeCode.UInt32:
switch (tc)
{
Expand All @@ -136,6 +141,7 @@ public static bool IsCompatibleWith(Type source, Type target)
return true;
}
break;

case TypeCode.Int64:
switch (tc)
{
Expand All @@ -146,6 +152,7 @@ public static bool IsCompatibleWith(Type source, Type target)
return true;
}
break;

case TypeCode.UInt64:
switch (tc)
{
Expand All @@ -156,6 +163,7 @@ public static bool IsCompatibleWith(Type source, Type target)
return true;
}
break;

case TypeCode.Single:
switch (tc)
{
Expand All @@ -164,6 +172,7 @@ public static bool IsCompatibleWith(Type source, Type target)
return true;
}
break;

default:
if (st == tt)
{
Expand Down
28 changes: 26 additions & 2 deletions test/System.Linq.Dynamic.Core.Tests/ExpressionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@ public class Foo
public string Two(int x, int y) => null;
}

public class SourceClass
{
public int A { get; set; }
}

public class TargetClass
{
public TestEnum A { get; set; }
}

[Fact]
public void ExpressionTests_Add_Number()
{
Expand Down Expand Up @@ -598,6 +608,20 @@ public void ExpressionTests_DoubleQualifiers_Negative()
Assert.Equal(resultValues.ToArray(), result2.ToArray());
}

[Fact]
public void ExpressionTests_Enum_Cast_Int_To_Enum()
{
// Arrange
var enumvalue = TestEnum.Var1;
var qry = new List<SourceClass> { new SourceClass { A = (int)enumvalue } }.AsQueryable();

// Act
var result = qry.Select<TargetClass>("new(A)").ToArray();

// Assert
result.Should().ContainEquivalentOf(new TargetClass { A = enumvalue });
}

[Fact]
public void ExpressionTests_Enum()
{
Expand Down Expand Up @@ -1634,11 +1658,11 @@ public void ExpressionTests_Select_ExpandoObjects()
dynamic a = new ExpandoObject();
a.Name = "a";
a.BlogId = 100;

dynamic b = new ExpandoObject();
b.Name = "b";
b.BlogId = 200;

var list = new List<dynamic> { a, b };
IQueryable qry = list.AsQueryable();

Expand Down