Added support for visiting of virtual bool properties in custom SqlExpression

Author: OlegNadymov

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -1264,10 +1264,13 @@ protected virtual object VisitLambda(LambdaExpression lambda)
 
                 if (m.Expression != null)
                 {
-                    string r = VisitMemberAccess(m).ToString();
-                    if (m.Expression.Type.IsNullableType())
+                    var r = VisitMemberAccess(m);
+                    if (!(r is PartialSqlString))
                         return r;
 
+                    if (m.Expression.Type.IsNullableType())
+                        return r.ToString();
+
                     return $"{r}={GetQuotedTrueValue()}";
                 }
 
@@ -1290,13 +1293,21 @@ protected virtual object VisitBinary(BinaryExpression b)
             var operand = BindOperant(b.NodeType);   //sep= " " ??
             if (operand == "AND" || operand == "OR")
             {
-                left = IsBooleanComparison(b.Left) 
-                    ? new PartialSqlString($"{VisitMemberAccess((MemberExpression) b.Left)}={GetQuotedTrueValue()}") 
-                    : Visit(b.Left);
+                if (IsBooleanComparison(b.Left))
+                {
+                    left = VisitMemberAccess((MemberExpression) b.Left);
+                    if (left is PartialSqlString)
+                        left = new PartialSqlString($"{left}={GetQuotedTrueValue()}");
+                }
+                else left = Visit(b.Left);
 
-                right = IsBooleanComparison(b.Right) 
-                    ? new PartialSqlString($"{VisitMemberAccess((MemberExpression) b.Right)}={GetQuotedTrueValue()}") 
-                    : Visit(b.Right);
+                if (IsBooleanComparison(b.Right))
+                {
+                    right = VisitMemberAccess((MemberExpression)b.Right);
+                    if (right is PartialSqlString)
+                        right = new PartialSqlString($"{right}={GetQuotedTrueValue()}");
+                }
+                else right = Visit(b.Right);
 
                 if (!(left is PartialSqlString) && !(right is PartialSqlString))
                 {

tests/ServiceStack.OrmLite.Tests/CustomSqlExpressionTests.cs

@@ -18,6 +18,8 @@ public class Waybill
         public string VirtProperty => "WaybillVirtPropertyValue";
 
         public string VirtProperty2 => "WaybillVirtPropertyValue2";
+
+        public bool BoolVirtProperty => false;
     }
 
     public class CustomSqlServerDialectProvider : SqliteOrmLiteDialectProvider
@@ -43,6 +45,8 @@ protected override Object GetMemberExpression(MemberExpression m)
                     return "WaybillVirtPropertyValue";
                 if (m.Member.Name == nameof(Waybill.VirtProperty2))
                     return "WaybillVirtPropertyValue2";
+                if (m.Member.Name == nameof(Waybill.BoolVirtProperty))
+                    return false;
             }
 
             return base.GetMemberExpression(m);
@@ -153,5 +157,63 @@ public void Can_Where_using_constant_filter8()
             var target = Db.Select(q);
             Assert.AreEqual(0, target.Count);
         }
+
+        [Test]
+        public void Can_Where_using_constant_filter9()
+        {
+            System.Linq.Expressions.Expression<Func<Waybill, bool>> filter = x => x.BoolVirtProperty;
+            var q = Db.From<Waybill>().Where(filter);
+            var target = Db.Select(q);
+            Assert.AreEqual(0, target.Count);
+        }
+
+        [Test]
+        public void Can_Where_using_constant_filter10()
+        {
+            System.Linq.Expressions.Expression<Func<Waybill, bool>> filter = x => !x.BoolVirtProperty;
+            var q = Db.From<Waybill>().Where(filter);
+            var target = Db.Select(q);
+            Assert.AreEqual(3, target.Count);
+        }
+
+        [Test]
+        public void Can_Where_using_constant_filter11()
+        {
+            System.Linq.Expressions.Expression<Func<Waybill, bool>> filter = x => x.BoolVirtProperty && x.VirtProperty == "WaybillVirtPropertyValue";
+            var q = Db.From<Waybill>().Where(filter);
+            var target = Db.Select(q);
+            Assert.AreEqual(0, target.Count);
+        }
+
+        [Test]
+        public void Can_Where_using_constant_filter12()
+        {
+            System.Linq.Expressions.Expression<Func<Waybill, bool>> filter = x => !x.BoolVirtProperty || x.VirtProperty == "WaybillVirtPropertyValue";
+            var q = Db.From<Waybill>().Where(filter);
+            var target = Db.Select(q);
+            Assert.AreEqual(3, target.Count);
+        }
+
+        [Test]
+        public void Can_Where_using_constant_filter13()
+        {
+            System.Linq.Expressions.Expression<Func<Waybill, bool>> filter = x => !x.BoolVirtProperty &&
+                                                                                  x.VirtProperty == "WaybillVirtPropertyValue" &&
+                                                                                  x.Number == 100;
+            var q = Db.From<Waybill>().Where(filter);
+            var target = Db.Select(q);
+            Assert.AreEqual(1, target.Count);
+        }
+
+        [Test]
+        public void Can_Where_using_constant_filter14()
+        {
+            System.Linq.Expressions.Expression<Func<Waybill, bool>> filter = x => x.Number == 100 &&
+                                                                                  (x.BoolVirtProperty ||
+                                                                                   x.VirtProperty == "WaybillVirtPropertyValue");
+            var q = Db.From<Waybill>().Where(filter);
+            var target = Db.Select(q);
+            Assert.AreEqual(1, target.Count);
+        }
     }
 }