Second commit: added support for visiting of virtual properties in custom SqlExpression

Author: OlegNadymov

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -1298,7 +1298,7 @@ protected virtual object VisitBinary(BinaryExpression b)
 
                 if (!(left is PartialSqlString) && !(right is PartialSqlString))
                 {
-                    var result = CachedExpressionCompiler.Evaluate(b);
+                    var result = CachedExpressionCompiler.Evaluate(PreEvaluateBinary(b, left, right));
                     return result;
                 }
 
@@ -1363,19 +1363,7 @@ protected virtual object VisitBinary(BinaryExpression b)
                 }
                 else if (!(left is PartialSqlString) && !(right is PartialSqlString))
                 {
-                    var visitedBinaryExp = b;
-
-                    if (IsParameterAccess(b.Left) || IsParameterAccess(b.Right))
-                    {
-                        var eLeft = !IsParameterAccess(b.Left) ? b.Left : Expression.Constant(left, b.Left.Type);
-                        var eRight = !IsParameterAccess(b.Right) ? b.Right : Expression.Constant(right, b.Right.Type);
-                        if (b.NodeType == ExpressionType.Coalesce)
-                            visitedBinaryExp = Expression.Coalesce(eLeft, eRight, b.Conversion);
-                        else
-                            visitedBinaryExp = Expression.MakeBinary(b.NodeType, eLeft, eRight, b.IsLiftedToNull, b.Method);
-                    }
-
-                    var evaluatedValue = CachedExpressionCompiler.Evaluate(visitedBinaryExp);
+                    var evaluatedValue = CachedExpressionCompiler.Evaluate(PreEvaluateBinary(b, left, right));
                     var result = VisitConstant(Expression.Constant(evaluatedValue));
                     return result;
                 }
@@ -1414,6 +1402,23 @@ protected virtual object VisitBinary(BinaryExpression b)
             }
         }
 
+        private BinaryExpression PreEvaluateBinary(BinaryExpression b, object left, object right)
+        {
+            var visitedBinaryExp = b;
+
+            if (IsParameterAccess(b.Left) || IsParameterAccess(b.Right))
+            {
+                var eLeft = !IsParameterAccess(b.Left) ? b.Left : Expression.Constant(left, b.Left.Type);
+                var eRight = !IsParameterAccess(b.Right) ? b.Right : Expression.Constant(right, b.Right.Type);
+                if (b.NodeType == ExpressionType.Coalesce)
+                    visitedBinaryExp = Expression.Coalesce(eLeft, eRight, b.Conversion);
+                else
+                    visitedBinaryExp = Expression.MakeBinary(b.NodeType, eLeft, eRight, b.IsLiftedToNull, b.Method);
+            }
+
+            return visitedBinaryExp;
+        }
+
         /// <summary>
         /// Determines whether the expression is the parameter inside MemberExpression which should be compared with TrueExpression.
         /// </summary>

tests/ServiceStack.OrmLite.Tests/CustomSqlExpressionTests.cs

@@ -16,6 +16,8 @@ public class Waybill
         public string Name { get; set; }
 
         public string VirtProperty => "WaybillVirtPropertyValue";
+
+        public string VirtProperty2 => "WaybillVirtPropertyValue2";
     }
 
     public class CustomSqlServerDialectProvider : SqliteOrmLiteDialectProvider
@@ -35,10 +37,12 @@ public CustomSqlExpression(IOrmLiteDialectProvider dialectProvider) : base(diale
 
         protected override Object GetMemberExpression(MemberExpression m)
         {
-            if (m.Member.DeclaringType == typeof(Waybill) &&
-                m.Member.Name == nameof(Waybill.VirtProperty))
+            if (m.Member.DeclaringType == typeof(Waybill))
             {
-                return "WaybillVirtPropertyValue";
+                if (m.Member.Name == nameof(Waybill.VirtProperty))
+                    return "WaybillVirtPropertyValue";
+                if (m.Member.Name == nameof(Waybill.VirtProperty2))
+                    return "WaybillVirtPropertyValue2";
             }
 
             return base.GetMemberExpression(m);
@@ -113,5 +117,41 @@ public void Can_Where_using_constant_filter4()
             var target = Db.Select(q);
             Assert.AreEqual(3, target.Count);
         }
+
+        [Test]
+        public void Can_Where_using_constant_filter5()
+        {
+            System.Linq.Expressions.Expression<Func<Waybill, bool>> filter = x => x.VirtProperty == "WaybillVirtPropertyValue" || x.VirtProperty2 == "WaybillVirtPropertyValue2";
+            var q = Db.From<Waybill>().Where(filter);
+            var target = Db.Select(q);
+            Assert.AreEqual(3, target.Count);
+        }
+
+        [Test]
+        public void Can_Where_using_constant_filter6()
+        {
+            System.Linq.Expressions.Expression<Func<Waybill, bool>> filter = x => x.VirtProperty == "WaybillVirtPropertyValue" && x.VirtProperty2 == "WaybillVirtPropertyValue2";
+            var q = Db.From<Waybill>().Where(filter);
+            var target = Db.Select(q);
+            Assert.AreEqual(3, target.Count);
+        }
+
+        [Test]
+        public void Can_Where_using_constant_filter7()
+        {
+            System.Linq.Expressions.Expression<Func<Waybill, bool>> filter = x => x.VirtProperty == "WaybillVirtPropertyValue" || x.VirtProperty2 == "Any";
+            var q = Db.From<Waybill>().Where(filter);
+            var target = Db.Select(q);
+            Assert.AreEqual(3, target.Count);
+        }
+
+        [Test]
+        public void Can_Where_using_constant_filter8()
+        {
+            System.Linq.Expressions.Expression<Func<Waybill, bool>> filter = x => x.VirtProperty == "WaybillVirtPropertyValue" && x.VirtProperty2 == "Any";
+            var q = Db.From<Waybill>().Where(filter);
+            var target = Db.Select(q);
+            Assert.AreEqual(0, target.Count);
+        }
     }
 }