Fix Linq expression parsing with ensurePredicate

huyhu · Apr 17, 2020 · 20f4627 · 20f4627
1 parent 21779c1
commit 20f4627
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/LiteDB.Tests/Mapper/LinqBsonExpression_Tests.cs b/LiteDB.Tests/Mapper/LinqBsonExpression_Tests.cs
@@ -242,9 +242,9 @@ public void Linq_Predicate()
 
             // unary expressions
             TestPredicate<User>(x => x.Active, "(Active = true)");
-            TestPredicate<User>(x => x.Active && x.Active, "((Active = true) AND (Active = true))");
-            TestPredicate<User>(x => x.Active && x.Active && x.Active, "((($.Active=true) AND ($.Active=true)) AND ($.Active=true))");
-            TestPredicate<User>(x => x.Active && !x.Active, "((Active = true) AND (Active = false))");
+            TestPredicate<User>(x => x.Active && x.Active, "(((Active) = true) AND ((Active) = true))");
+            TestPredicate<User>(x => x.Active && x.Active && x.Active, "(((($.Active)=true) AND (($.Active)=true)) AND (($.Active)=true))");
+            TestPredicate<User>(x => x.Active && !x.Active, "(((Active) = true) AND (Active = false))");
             TestPredicate<User>(x => !x.Active, "(Active = false)");
             TestPredicate<User>(x => !x.Active == true, "((Active = false) = @p0)", true);
             TestPredicate<User>(x => !(x.Salary == 50), "((Salary = @p0)) = false", 50);
@@ -278,7 +278,7 @@ public void Linq_Nullables()
             TestPredicate<User>(x => x.Latitude > 0, "(Latitude > @p0)", 0);
 
             TestPredicate<User>(x => x.Latitude != null && x.Latitude > 0, "((Latitude != @p0) AND (Latitude > @p1))", BsonValue.Null, 0);
-            TestPredicate<User>(x => x.Latitude.HasValue && x.Latitude > 0, "(((IS_NULL(Latitude) = false) = true) AND (Latitude > @p0))", 0);
+            TestPredicate<User>(x => x.Latitude.HasValue && x.Latitude > 0, "((((IS_NULL(Latitude) = false)) = true) AND (Latitude > @p0))", 0);
         }
 
         [Fact]

diff --git a/LiteDB/Client/Mapper/Linq/LinqExpressionVisitor.cs b/LiteDB/Client/Mapper/Linq/LinqExpressionVisitor.cs
@@ -663,8 +663,10 @@ private void VisitAsPredicate(Expression expr, bool ensurePredicate)
 
             if (ensurePredicate)
             {
+                _builder.Append("(");
                 _builder.Append("(");
                 base.Visit(expr);
+                _builder.Append(")");
                 _builder.Append(" = true)");
             }
             else