Fix for parsing Guid and string in the same condition

Author: Oleg Nadymov

src/System.Linq.Dynamic.Core/Parser/SupportedOperands/IEqualitySignatures.cs

@@ -13,9 +13,13 @@ internal interface IEqualitySignatures : IRelationalSignatures
 
         void F(Guid x, Guid y);
         void F(Guid? x, Guid? y);
-        void F(Guid x, string y);
-        void F(Guid? x, string y);
-        void F(string x, Guid y);
-        void F(string x, Guid? y);
+
+        // Disabled 2 lines below according to unit test ParseLambda_With_If_Guid_Null
+        //void F(Guid x, string y);
+        //void F(Guid? x, string y);
+
+        // Disabled 2 lines below according to unit test ParseLambda_With_If_Null_Guid
+        //void F(string x, Guid y);
+        //void F(string x, Guid? y);
     }
 }

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

@@ -11,6 +11,8 @@ namespace System.Linq.Dynamic.Core.Tests
 {
     public class DynamicExpressionParserTests
     {
+
+
         private class MyClass
         {
             public int Foo()
@@ -452,5 +454,39 @@ public void ParseLambda_With_InnerStringLiteral()
             object result = del.DynamicInvoke(String.Empty);
             Check.That(result).IsEqualTo(originalTrueValue);
         }
+
+        [Fact]
+        public void ParseLambda_With_If_Guid_Null()
+        {
+            var objContext = new User();
+            var guidEmpty = Guid.Empty;
+            var someId = Guid.NewGuid();
+            var expressionText = $"iif(@0.{nameof(objContext.Id)} == null, @0.{nameof(objContext.Id)} == Guid.Parse(\"{someId}\"), {nameof(objContext.Id)}={nameof(objContext.Id)})";
+
+            var lambda = System.Linq.Dynamic.Core.DynamicExpressionParser.ParseLambda(typeof(User), null, expressionText, objContext);
+            var boolLambda = lambda as Expression<Func<User, bool>>;
+            Check.That(boolLambda).IsNotEqualTo(null);
+
+            var del = lambda.Compile();
+            object result = del.DynamicInvoke(objContext);
+            Check.That(result).IsEqualTo(true);
+        }
+
+        [Fact]
+        public void ParseLambda_With_If_Null_Guid()
+        {
+            var objContext = new User();
+            var guidEmpty = Guid.Empty;
+            var someId = Guid.NewGuid();
+            var expressionText = $"iif(null == @0.{nameof(objContext.Id)}, @0.{nameof(objContext.Id)} == Guid.Parse(\"{someId}\"), {nameof(objContext.Id)}={nameof(objContext.Id)})";
+
+            var lambda = System.Linq.Dynamic.Core.DynamicExpressionParser.ParseLambda(typeof(User), null, expressionText, objContext);
+            var boolLambda = lambda as Expression<Func<User, bool>>;
+            Check.That(boolLambda).IsNotEqualTo(null);
+
+            var del = lambda.Compile();
+            object result = del.DynamicInvoke(objContext);
+            Check.That(result).IsEqualTo(true);
+        }
     }
 }