Fixed IEquatable and IComparable (#94)

Author: StefH

ChangeLog.txt

@@ -1,3 +1,3 @@
 https://github.com/GitTools/GitReleaseNotes
 
-GitReleaseNotes.exe . /OutputFile CHANGELOG.md /Version 1.0.7.5
+GitReleaseNotes.exe . /OutputFile CHANGELOG.md /Version 1.0.7.6

src/EntityFramework.DynamicLinq/EntityFramework.DynamicLinq.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>Dynamic Linq extensions for EntityFramework which adds Async support</Description>
     <AssemblyTitle>EntityFramework.DynamicLinq</AssemblyTitle>
-    <VersionPrefix>1.0.4.4</VersionPrefix>
+    <VersionPrefix>1.0.4.6</VersionPrefix>
     <Authors>Stef Heyenrath</Authors>
     <TargetFrameworks>net45;net46</TargetFrameworks>
     <DefineConstants>EF</DefineConstants>

src/Microsoft.EntityFrameworkCore.DynamicLinq/Microsoft.EntityFrameworkCore.DynamicLinq.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support</Description>
     <AssemblyTitle>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyTitle>
-    <VersionPrefix>1.0.4.5</VersionPrefix>
+    <VersionPrefix>1.0.4.6</VersionPrefix>
     <Authors>Stef Heyenrath</Authors>
     <TargetFrameworks>net451;net46;netstandard1.3;uap10.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);EFCORE</DefineConstants>

src/System.Linq.Dynamic.Core/ExpressionParser.cs

@@ -700,8 +700,24 @@ Expression ParseComparisonOperator()
                 }
                 else
                 {
-                    CheckAndPromoteOperands(isEquality ? typeof(IEqualitySignatures) : typeof(IRelationalSignatures),
-                        op.Text, ref left, ref right, op.Pos);
+                    bool typesAreSameAndImplementCorrectInterface = false;
+                    if (left.Type == right.Type)
+                    {
+                        var interfaces = left.Type.GetInterfaces().Where(x => x.GetTypeInfo().IsGenericType);
+                        if (isEquality)
+                        {
+                            typesAreSameAndImplementCorrectInterface = interfaces.Any(x => x.GetGenericTypeDefinition() == typeof(IEquatable<>));
+                        }
+                        else
+                        {
+                            typesAreSameAndImplementCorrectInterface = interfaces.Any(x => x.GetGenericTypeDefinition() == typeof(IComparable<>));
+                        }
+                    }
+
+                    if (!typesAreSameAndImplementCorrectInterface)
+                    {
+                        CheckAndPromoteOperands(isEquality ? typeof(IEqualitySignatures) : typeof(IRelationalSignatures), op.Text, ref left, ref right, op.Pos);
+                    }
                 }
 
                 switch (op.Id)
@@ -1551,6 +1567,7 @@ static Type FindGenericType(Type generic, Type type)
             {
                 if (type.GetTypeInfo().IsGenericType && type.GetGenericTypeDefinition() == generic)
                     return type;
+
                 if (generic.GetTypeInfo().IsInterface)
                 {
                     foreach (Type intfType in type.GetInterfaces())
@@ -1559,8 +1576,10 @@ static Type FindGenericType(Type generic, Type type)
                         if (found != null) return found;
                     }
                 }
+
                 type = type.GetTypeInfo().BaseType;
             }
+
             return null;
         }
 
@@ -1843,9 +1862,12 @@ static bool IsEnumType(Type type)
         void CheckAndPromoteOperand(Type signatures, string opName, ref Expression expr, int errorPos)
         {
             Expression[] args = { expr };
+
             MethodBase method;
             if (FindMethod(signatures, "F", false, args, out method) != 1)
-                throw ParseError(errorPos, Res.IncompatibleOperand, opName, GetTypeName(args[0].Type));
+            {
+                throw IncompatibleOperandError(opName, expr, errorPos);
+            }
 
             expr = args[0];
         }
@@ -1864,9 +1886,14 @@ void CheckAndPromoteOperands(Type signatures, string opName, ref Expression left
             right = args[1];
         }
 
-        static Exception IncompatibleOperandsError(string opName, Expression left, Expression right, int pos)
+        static Exception IncompatibleOperandError(string opName, Expression expr, int errorPos)
         {
-            return ParseError(pos, Res.IncompatibleOperands, opName, GetTypeName(left.Type), GetTypeName(right.Type));
+            return ParseError(errorPos, Res.IncompatibleOperand, opName, GetTypeName(expr.Type));
+        }
+
+        static Exception IncompatibleOperandsError(string opName, Expression left, Expression right, int errorPos)
+        {
+            return ParseError(errorPos, Res.IncompatibleOperands, opName, GetTypeName(left.Type), GetTypeName(right.Type));
         }
 
         static MemberInfo FindPropertyOrField(Type type, string memberName, bool staticAccess)
@@ -2107,8 +2134,10 @@ Expression PromoteExpression(Expression expr, Type type, bool exact, bool conver
 
             if (IsCompatibleWith(expr.Type, type))
             {
-                if (type.GetTypeInfo().IsValueType || exact || (expr.Type.GetTypeInfo().IsValueType && convertExpr))
+                if (type.GetTypeInfo().IsValueType || exact || expr.Type.GetTypeInfo().IsValueType && convertExpr)
+                {
                     return Expression.Convert(expr, type);
+                }
 
                 return expr;
             }

src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>This is a .NETStandard/ .NET Core port of the the Microsoft assembly for the .Net 4.0 Dynamic language functionality.</Description>
     <AssemblyTitle>System.Linq.Dynamic.Core</AssemblyTitle>
-    <VersionPrefix>1.0.7.5</VersionPrefix>
+    <VersionPrefix>1.0.7.6</VersionPrefix>
     <Authors>Microsoft;Scott Guthrie;King Wilder;Nathan Arnott;Stef Heyenrath</Authors>
     <TargetFrameworks>net35;net40;net45;net46;netstandard1.3;uap10.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

test/EntityFramework.DynamicLinq.Tests.net452/EntityFramework.DynamicLinq.Tests.net452.csproj

@@ -48,6 +48,15 @@
     <Reference Include="Microsoft.AspNet.Identity.EntityFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.1\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll</HintPath>
     </Reference>
+    <Reference Include="MongoDB.Bson, Version=2.4.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MongoDB.Bson.2.4.4\lib\net45\MongoDB.Bson.dll</HintPath>
+    </Reference>
+    <Reference Include="MongoDB.Driver, Version=2.4.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MongoDB.Driver.2.4.4\lib\net45\MongoDB.Driver.dll</HintPath>
+    </Reference>
+    <Reference Include="MongoDB.Driver.Core, Version=2.4.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MongoDB.Driver.Core.2.4.4\lib\net45\MongoDB.Driver.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -60,6 +69,9 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />

test/EntityFramework.DynamicLinq.Tests.net452/packages.config

@@ -4,9 +4,13 @@
   <package id="Linq.PropertyTranslator.Core" version="1.0.3.0" targetFramework="net452" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
   <package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net452" />
+  <package id="MongoDB.Bson" version="2.4.4" targetFramework="net452" />
+  <package id="MongoDB.Driver" version="2.4.4" targetFramework="net452" />
+  <package id="MongoDB.Driver.Core" version="2.4.4" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
   <package id="NFluent" version="2.0.0-alpha" targetFramework="net452" />
   <package id="QueryInterceptor.Core" version="1.0.5.0" targetFramework="net452" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net452" />
   <package id="xunit" version="2.2.0-beta4-build3444" targetFramework="net452" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
   <package id="xunit.assert" version="2.2.0-beta4-build3444" targetFramework="net452" />

test/EntityFramework.DynamicLinq.Tests/EntityFramework.DynamicLinq.Tests.csproj

@@ -30,6 +30,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
+    <PackageReference Include="MongoDB.Driver" Version="2.4.4" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
     <PackageReference Include="Linq.PropertyTranslator.Core" Version="1.0.1" />
     <PackageReference Include="QueryInterceptor.Core" Version="1.0.3" />

test/System.Linq.Dynamic.Core.Tests/ExpressionTests.cs

@@ -7,6 +7,7 @@
 using Newtonsoft.Json.Linq;
 using Xunit;
 using NFluent;
+using MongoDB.Bson;
 
 namespace System.Linq.Dynamic.Core.Tests
 {
@@ -38,6 +39,13 @@ public class TestGuidNullClass
             public int Id { get; set; }
         }
 
+        public class TestObjectIdClass
+        {
+            public int Id { get; set; }
+
+            public ObjectId ObjectId { get; set; }
+        }
+
         [Fact]
         public void ExpressionTests_Add_Number()
         {
@@ -943,6 +951,51 @@ public void ExpressionTests_Indexer_Issue57()
             Assert.Equal(expected, result);
         }
 
+        [Fact]
+        public void ExpressionTests_IComparable_GreaterThan()
+        {
+            // Assign
+            const string id = "111111111111111111111111";
+            var queryable = new[] { new TestObjectIdClass { Id = 1, ObjectId = ObjectId.Parse(id) }, new TestObjectIdClass { Id = 2, ObjectId = ObjectId.Parse("221111111111111111111111") } }.AsQueryable();
+
+            // Act
+            var result = queryable.Where(x => x.ObjectId > ObjectId.Parse(id)).ToArray();
+            var dynamicResult = queryable.Where("it.ObjectId > @0", ObjectId.Parse(id)).ToArray();
+
+            // Assert
+            Check.That(dynamicResult).ContainsExactly(result);
+        }
+
+        [Fact]
+        public void ExpressionTests_IEquatable_Equal()
+        {
+            // Assign
+            const string id = "111111111111111111111111";
+            var queryable = new[] { new TestObjectIdClass { Id = 1, ObjectId = ObjectId.Parse(id) }, new TestObjectIdClass { Id = 2, ObjectId = ObjectId.Parse("221111111111111111111111") } }.AsQueryable();
+
+            // Act
+            var result = queryable.First(x => x.ObjectId == ObjectId.Parse(id));
+            var dynamicResult = queryable.First("it.ObjectId == @0", ObjectId.Parse(id));
+
+            // Assert
+            Check.That(dynamicResult.Id).Equals(result.Id);
+        }
+
+        [Fact]
+        public void ExpressionTests_IEquatable_NotEqual()
+        {
+            // Assign
+            const string id = "111111111111111111111111";
+            var queryable = new[] { new TestObjectIdClass { Id = 1, ObjectId = ObjectId.Parse(id) }, new TestObjectIdClass { Id = 2, ObjectId = ObjectId.Parse("221111111111111111111111") } }.AsQueryable();
+
+            // Act
+            var result = queryable.First(x => x.ObjectId != ObjectId.Parse(id));
+            var dynamicResult = queryable.First("it.ObjectId != @0", ObjectId.Parse(id));
+
+            // Assert
+            Check.That(dynamicResult.Id).Equals(result.Id);
+        }
+
         [Fact]
         public void ExpressionTests_LogicalAndOr()
         {

test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj

@@ -18,6 +18,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.4.4" />
     <PackageReference Include="OpenCover" Version="4.6.519" />
     <PackageReference Include="ReportGenerator" Version="2.5.6" />
     <PackageReference Include="xunit.runner.console" Version="2.3.0-beta1-build3642" />
@@ -58,7 +59,7 @@
     <PackageReference Include="System.Threading.Tasks">
       <Version>4.3.0</Version>
     </PackageReference>
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0"/>
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup>