Merge pull request #37 from matteobortolazzo/dev

Fixes PR#36.

Author: matteobortolazzo

CHANGELOG.md

@@ -1,4 +1,9 @@
-# 1.0.1 (2019-04-27)
+# 1.0.2 (2019-05-02)
+
+## Bug Fixes
+* **_find:** Boolean member expressions converted to binary expressions in Where (Fix [#PR36](https://github.com/matteobortolazzo/couchdb-net/pull/36)).
+
+# 1.0.1 (2019-04-27)
 
 ## Bug Fixes
 * **Everywhere:** Flurl JSON serialization based on CouchSettings' PropertyCaseType.

LATEST_CHANGE.md

@@ -1,2 +1,2 @@
 ## Bug Fixes
-* **Everywhere:** Flurl JSON serialization based on CouchSettings' PropertyCaseType.
+* **_find:** Boolean member expression converted to binary expression in Where (Fix [#PR36](https://github.com/matteobortolazzo/couchdb-net/pull/36)).

src/CouchDB.Driver/CouchQueryProvider.cs

@@ -1,4 +1,5 @@
 using CouchDB.Driver.DTOs;
+using CouchDB.Driver.ExpressionVisitors;
 using CouchDB.Driver.Helpers;
 using CouchDB.Driver.Settings;
 using CouchDB.Driver.Types;
@@ -59,13 +60,16 @@ public override object Execute(Expression e, bool completeResponse)
             var result = generic.Invoke(this, new[] { body, (object)_filterMethodInfo, _filteringExpressions });
             return result;
         }
-        
-        private string Translate(Expression expression)
+
+        private string Translate(Expression e)
         {
-            expression = Evaluator.PartialEval(expression);
-            return new QueryTranslator(_settings).Translate(expression);
-        }
+            e = Evaluator.PartialEval(e);
+            var whereVisitor = new WhereExpressionVisitor();
+            e = whereVisitor.Visit(e);
 
+            return new QueryTranslator(_settings).Translate(e);
+        }
+        
         public object GetCouchListOrFiltered<T>(string body, MethodInfo filteringMethodInfo, Expression[] filteringExpressions)
         {
             FindResult<T> result = _flurlClient

src/CouchDB.Driver/ExpressionVisitors/WhereExpressionVisitor.cs

@@ -0,0 +1,58 @@
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace CouchDB.Driver.ExpressionVisitors
+{
+    internal  class WhereExpressionVisitor : ExpressionVisitor
+    {
+        private bool _visitingWhereMethod;
+
+        protected override Expression VisitMethodCall(MethodCallExpression m)
+        {
+            _visitingWhereMethod = m.Method.Name == "Where" && m.Method.DeclaringType == typeof(Queryable);
+            if (_visitingWhereMethod)
+            {
+                Expression result = base.VisitMethodCall(m);
+                _visitingWhereMethod = false;
+                return result;
+            }
+            return base.VisitMethodCall(m);
+        }
+
+        protected override Expression VisitBinary(BinaryExpression expression)
+        {
+            if (expression.Right is ConstantExpression c && c.Type == typeof(bool) && 
+                (expression.NodeType == ExpressionType.Equal || expression.NodeType == ExpressionType.NotEqual))
+            {
+                return expression;
+            }
+            return base.VisitBinary(expression);
+        }
+
+        protected override Expression VisitMember(MemberExpression expression)
+        {
+            if (IsWhereBooleanExpression(expression))
+            {
+                return Expression.MakeBinary(ExpressionType.Equal, expression, Expression.Constant(true));
+            }
+            return base.VisitMember(expression);
+        }
+
+        protected override Expression VisitUnary(UnaryExpression expression)
+        {
+            if (expression.NodeType == ExpressionType.Not && expression.Operand is MemberExpression m && IsWhereBooleanExpression(m))
+            {
+                return Expression.MakeBinary(ExpressionType.Equal, m, Expression.Constant(false));
+            }
+            return base.VisitUnary(expression);
+        }
+
+        private bool IsWhereBooleanExpression(MemberExpression expression)
+        {
+            return _visitingWhereMethod && 
+                expression.Member is PropertyInfo info && 
+                info.PropertyType == typeof(bool);
+        }
+    }
+}

tests/CouchDB.Driver.UnitTests/Find/Find_Selector.cs

@@ -1,5 +1,6 @@
 using CouchDB.Driver.UnitTests.Models;
 using System;
+using System.Linq;
 using System.Linq.Expressions;
 using Xunit;
 
@@ -73,5 +74,41 @@ public void GuidQuery()
             var json = rebels.Where(r => r.Guid == guid).ToString();
             Assert.Equal(@"{""selector"":{""guid"":""83c79283-f634-41e3-8aab-674bdbae3413""}}", json);
         }
+        [Fact]
+        public void Variable_Bool_True()
+        {
+            var json = rebels.Where(r => r.IsJedi).OrderBy(r => r.IsJedi).ToString();
+            Assert.Equal(@"{""selector"":{""isJedi"":true},""sort"":[""isJedi""]}", json);
+        }
+        [Fact]
+        public void Variable_Bool_False()
+        {
+            var json = rebels.Where(r => !r.IsJedi).OrderBy(r => r.IsJedi).ToString();
+            Assert.Equal(@"{""selector"":{""isJedi"":false},""sort"":[""isJedi""]}", json);
+        }
+        [Fact]
+        public void Variable_Bool_ExplicitTrue()
+        {
+            var json = rebels.Where(r => r.IsJedi == true).OrderBy(r => r.IsJedi).ToString();
+            Assert.Equal(@"{""selector"":{""isJedi"":true},""sort"":[""isJedi""]}", json);
+        }
+        [Fact]
+        public void Variable_Bool_ExplicitFalse()
+        {
+            var json = rebels.Where(r => r.IsJedi == false).OrderBy(r => r.IsJedi).ToString();
+            Assert.Equal(@"{""selector"":{""isJedi"":false},""sort"":[""isJedi""]}", json);
+        }
+        [Fact]
+        public void Variable_Bool_ExplicitNotTrue()
+        {
+            var json = rebels.Where(r => r.IsJedi != true).OrderBy(r => r.IsJedi).ToString();
+            Assert.Equal(@"{""selector"":{""isJedi"":{""$ne"":true}},""sort"":[""isJedi""]}", json);
+        }
+        [Fact]
+        public void Variable_Bool_ExplicitNotFalse()
+        {
+            var json = rebels.Where(r => r.IsJedi != false).OrderBy(r => r.IsJedi).ToString();
+            Assert.Equal(@"{""selector"":{""isJedi"":{""$ne"":false}},""sort"":[""isJedi""]}", json);
+        }
     }
 }

tests/CouchDB.Driver.UnitTests/_Models/Rebel.cs

@@ -10,6 +10,7 @@ public class Rebel : CouchDocument
         public string Name { get; set; }
         public string Surname { get; set; }
         public int Age { get; set; }
+        public bool IsJedi { get; set; }
         public Species Species { get; set; }
         public Guid Guid { get; set; }
         public List<string> Skills { get; set; }