Added Linq-to-BsonExpression mapping for non-short-circuit 'AND' and …

…'OR'
mbdavid · Apr 15, 2020 · 21779c1 · 21779c1 · lbnascimento · Apr 15, 2020
1 parent 4fe3afc
commit 21779c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/LiteDB.Tests/Mapper/LinqBsonExpression_Tests.cs b/LiteDB.Tests/Mapper/LinqBsonExpression_Tests.cs
@@ -236,6 +236,9 @@ public void Linq_Predicate()
             TestPredicate<User>(x => x.Salary != 50, "(Salary != @p0)", 50);
             TestPredicate<User>(x => x.Salary == x.Id, "(Salary = _id)");
             TestPredicate<User>(x => x.Salary > 50 && x.Name == "John", "((Salary > @p0) AND (Name = @p1))", 50, "John");
+            TestPredicate<User>(x => x.Salary > 50 & x.Name == "John", "((Salary > @p0) AND (Name = @p1))", 50, "John");
+            TestPredicate<User>(x => x.Salary > 50 || x.Name == "John", "((Salary > @p0) OR (Name = @p1))", 50, "John");
+            TestPredicate<User>(x => x.Salary > 50 | x.Name == "John", "((Salary > @p0) OR (Name = @p1))", 50, "John");
 
             // unary expressions
             TestPredicate<User>(x => x.Active, "(Active = true)");

diff --git a/LiteDB/Client/Mapper/Linq/LinqExpressionVisitor.cs b/LiteDB/Client/Mapper/Linq/LinqExpressionVisitor.cs
@@ -585,7 +585,9 @@ private string GetOperator(ExpressionType nodeType)
                 case ExpressionType.GreaterThanOrEqual: return " >= ";
                 case ExpressionType.LessThan: return " < ";
                 case ExpressionType.LessThanOrEqual: return " <= ";
+                case ExpressionType.And: return " AND ";
                 case ExpressionType.AndAlso: return " AND ";
+                case ExpressionType.Or: return " OR ";
                 case ExpressionType.OrElse: return " OR ";
             }