Merge pull request #1 from ServiceStack/master

Update from upstream (my changes)

Author: OlegNadymov

lib/ServiceStack.Client.dll

@@ -9,7 +9,7 @@ namespace ServiceStack.OrmLite
 {
     public abstract partial class SqlExpression<T> : ISqlExpression
     {
-        List<ModelDefinition> tableDefs = new List<ModelDefinition>();
+        protected List<ModelDefinition> tableDefs = new List<ModelDefinition>();
 
         public bool IsJoinedTable(Type type)
         {

lib/ServiceStack.Common.dll

@@ -37,7 +37,7 @@ public abstract partial class SqlExpression<T> : ISqlExpression, IHasUntypedSqlE
         protected bool useFieldName = false;
         protected bool selectDistinct = false;
         protected bool CustomSelect { get; set; }
-        private ModelDefinition modelDef;
+        protected ModelDefinition modelDef;
         public bool PrefixFieldWithTableName { get; set; }
         public bool WhereStatementWithoutWhereString { get; set; }
         public IOrmLiteDialectProvider DialectProvider { get; set; }
@@ -1238,12 +1238,12 @@ protected virtual object VisitBinary(BinaryExpression b)
             var operand = BindOperant(b.NodeType);   //sep= " " ??
             if (operand == "AND" || operand == "OR")
             {
-                if (IsNeedCompareToTrue(b.Left))
+                if (IsBooleanComparison(b.Left))
                     left = new PartialSqlString(string.Format("{0}={1}", VisitMemberAccess((MemberExpression) b.Left), GetQuotedTrueValue()));
                 else
                     left = Visit(b.Left);
 
-                if (IsNeedCompareToTrue(b.Right))
+                if (IsBooleanComparison(b.Right))
                     right = new PartialSqlString(string.Format("{0}={1}", VisitMemberAccess((MemberExpression) b.Right), GetQuotedTrueValue()));
                 else
                     right = Visit(b.Right);
@@ -1354,17 +1354,16 @@ protected virtual object VisitBinary(BinaryExpression b)
         /// <summary>
         /// Determines whether the expression is the parameter inside MemberExpression which should be compared with TrueExpression.
         /// </summary>
-        /// <param name="e">The specified expression.</param>
         /// <returns>Returns true if the specified expression is the parameter inside MemberExpression which should be compared with TrueExpression;
         /// otherwise, false.</returns>
-        protected virtual bool IsNeedCompareToTrue(Expression e)
+        protected virtual bool IsBooleanComparison(Expression e)
         {
             if (!(e is MemberExpression)) return false;
 
             var m = (MemberExpression)e;
 
             if (m.Member.DeclaringType.IsNullableType() &&
-                m.Member.Name == "HasValue") //nameof(Nullable<bool>.HasValue))
+                m.Member.Name == "HasValue") //nameof(Nullable<bool>.HasValue)
                 return false;
 
             return IsParameterAccess(m);
@@ -1373,7 +1372,6 @@ protected virtual bool IsNeedCompareToTrue(Expression e)
         /// <summary>
         /// Determines whether the expression is the parameter.
         /// </summary>
-        /// <param name="e">The specified expression.</param>
         /// <returns>Returns true if the specified expression is parameter;
         /// otherwise, false.</returns>
         protected virtual bool IsParameterAccess(Expression e)
@@ -1382,9 +1380,8 @@ protected virtual bool IsParameterAccess(Expression e)
         }
 
         /// <summary>
-        /// Determines whether the expression is the parameter or convert.
+        /// Determines whether the expression is a Parameter or Convert Expression.
         /// </summary>
-        /// <param name="e">The specified expression.</param>
         /// <returns>Returns true if the specified expression is parameter or convert;
         /// otherwise, false.</returns>
         protected virtual bool IsParameterOrConvertAccess(Expression e)
@@ -1398,38 +1395,42 @@ protected bool CheckExpressionForTypes(Expression e, ExpressionType[] types)
             {
                 if (types.Contains(e.NodeType))
                 {
-                    var isSubExprAccess = e is UnaryExpression &&
-                                          ((UnaryExpression)e).Operand is IndexExpression;
+                    var subUnaryExpr = e as UnaryExpression;
+                    var isSubExprAccess = subUnaryExpr != null && subUnaryExpr.Operand is IndexExpression;
 
                     if (!isSubExprAccess)
                         return true;
                 }
 
-                if (e is BinaryExpression)
+                var binaryExpr = e as BinaryExpression;
+                if (binaryExpr != null)
                 {
-                    if (CheckExpressionForTypes(((BinaryExpression)e).Left, types))
+                    if (CheckExpressionForTypes(binaryExpr.Left, types))
                         return true;
 
-                    if (CheckExpressionForTypes(((BinaryExpression)e).Right, types))
+                    if (CheckExpressionForTypes(binaryExpr.Right, types))
                         return true;
                 }
 
-                if (e is MethodCallExpression)
+                var methodCallExpr = e as MethodCallExpression;
+                if (methodCallExpr != null)
                 {
-                    for (int i = 0; i < ((MethodCallExpression)e).Arguments.Count; i++)
+                    for (var i = 0; i < methodCallExpr.Arguments.Count; i++)
                     {
-                        if (CheckExpressionForTypes(((MethodCallExpression)e).Arguments[0], types))
+                        if (CheckExpressionForTypes(methodCallExpr.Arguments[0], types))
                             return true;
                     }
                 }
 
-                if (e is UnaryExpression)
+                var unaryExpr = e as UnaryExpression;
+                if (unaryExpr != null)
                 {
-                    if (CheckExpressionForTypes(((UnaryExpression)e).Operand, types))
+                    if (CheckExpressionForTypes(unaryExpr.Operand, types))
                         return true;
                 }
 
-                e = e is MemberExpression ? ((MemberExpression)e).Expression : null;
+                var memberExpr = e as MemberExpression;
+                e = memberExpr != null ? memberExpr.Expression : null;
             }
 
             return false;
@@ -1834,7 +1835,7 @@ protected string RemoveQuoteFromAlias(string exp)
             return exp;
         }
 
-        protected bool IsFieldName(object quotedExp)
+        protected virtual bool IsFieldName(object quotedExp)
         {
             var fieldExpr = quotedExp.ToString().StripTablePrefixes();
             var unquotedExpr = fieldExpr.StripQuotes();

lib/ServiceStack.Interfaces.dll

@@ -4,6 +4,8 @@
 using System.Linq;
 using NUnit.Framework;
 using ServiceStack.DataAnnotations;
+using ServiceStack.Logging;
+using ServiceStack.Text;
 
 namespace ServiceStack.OrmLite.Tests
 {
@@ -363,20 +365,20 @@ public void Can_Where_using_filter_with_nested_properties()
                 Join<TestType2>().
                 Where(x => (!x.NullableBoolCol.HasValue || x.NullableBoolCol.Value) && x.NullableIntCol.HasValue && x.TestType2ObjCol.BoolCol);
             var target = Db.Select(q);
-            Assert.AreEqual(2, target.Count);
+            Assert.That(target.Count, Is.EqualTo(2));
 
             q = Db.From<TestType>().
                 Join<TestType2>().
                 Where(x => x.TestType2ObjCol.BoolCol && x.DateCol != DateTime.MinValue);
             target = Db.Select(q);
-            Assert.AreEqual(2, target.Count);
+            Assert.That(target.Count, Is.EqualTo(2));
 
             q = Db.From<TestType>().
                 Join<TestType2>().
                 Where(x => x.TestType2ObjCol.BoolCol && x.TestType2ObjCol.BoolCol == nullableTrue &&
                            x.DateCol != DateTime.MinValue && x.TestType2ObjCol.TestType2Name == filterText2);
             target = Db.Select(q);
-            Assert.AreEqual(1, target.Count);
+            Assert.That(target.Count, Is.EqualTo(1));
 
             var intValue = 300;
             q = Db.From<TestType>().
@@ -386,7 +388,7 @@ public void Can_Where_using_filter_with_nested_properties()
                            x.TestType2ObjCol.TestType3ObjCol.TestType3Name == filterText3 &&
                            x.TestType2ObjCol.TestType3ObjCol.CustomInt == new CustomInt(intValue));
             target = Db.Select(q);
-            Assert.AreEqual(1, target.Count);
+            Assert.That(target.Count, Is.EqualTo(1));
 
             q = Db.From<TestType>().
                 Join<TestType2>().
@@ -397,7 +399,7 @@ public void Can_Where_using_filter_with_nested_properties()
                 Having(x => (Sql.Max(x.TestType2ObjCol.TestType3ObjCol.CustomInt) ?? 0) == new CustomInt(100)).
                 Select(x => x.TestType2ObjCol.TestType3ObjCol.CustomInt);
             target = Db.Select(q);
-            Assert.AreEqual(1, target.Count);
+            Assert.That(target.Count, Is.EqualTo(1));
 
             q = Db.From<TestType>().
                 Join<TestType2>().
@@ -408,7 +410,7 @@ public void Can_Where_using_filter_with_nested_properties()
                 Having(x => (Sql.Max(x.TestType2ObjCol.TestType3ObjCol.CustomInt) ?? 0) != 10).
                 Select(x => x.TestType2ObjCol.TestType3ObjCol.CustomInt);
             target = Db.Select(q);
-            Assert.AreEqual(1, target.Count);
+            Assert.That(target.Count, Is.EqualTo(1));
         }
 
         private int MethodReturningInt(int val)

lib/ServiceStack.Text.dll

@@ -1,9 +1,11 @@
 using System;
 using System.Data;
 using System.Linq;
+using System.Linq.Expressions;
 using NUnit.Framework;
 using ServiceStack.DataAnnotations;
 using ServiceStack.Logging;
+using ServiceStack.OrmLite.SqlServer;
 using ServiceStack.Text;
 
 namespace ServiceStack.OrmLite.Tests.Issues
@@ -238,6 +240,45 @@ public void SubExpressions_TestMethod3()
                 w.TestMethod3();
             }
         }
+
+        [Test]
+        public void SubExpressions_with_CustomSqlExpression_and_merging_multiple_predicates()
+        {
+            var db = new OrmLiteConnection(new OrmLiteConnectionFactory("test", new CustomSqlServerDialectProvider()));
+
+            var q = db.From<MarginItem>().Where(s => Sql.In(s.Identity,
+                db.From<WaybillItem>()
+                    .Where(w => Sql.In(w.WaybillId,
+                        db.From<Waybill>()
+                            .Where(bb => bb.Identity == null)
+                            .And(bb => bb.Name == "test")
+                            .Select(ww => ww.Identity))
+                    )
+                    .Select(b => b.MarginItemId)));
+
+            Assert.That(q.ToSelectStatement().NormalizeSql(), Is.StringContaining("@"));
+        }
+    }
+
+    class CustomSqlExpression<T> : SqlServerExpression<T>
+    {
+        private Expression<Func<T, bool>> _whereExpression;
+
+        public CustomSqlExpression(IOrmLiteDialectProvider dialectProvider) : base(dialectProvider) {}
+
+        public override SqlExpression<T> And(Expression<Func<T, bool>> predicate)
+        {
+            _whereExpression = _whereExpression == null ? predicate : predicate.And(_whereExpression);
+            return base.And(predicate);
+        }
+    }
+
+    class CustomSqlServerDialectProvider : SqlServerOrmLiteDialectProvider
+    {
+        public override SqlExpression<T> SqlExpression<T>()
+        {
+            return new CustomSqlExpression<T>(this);
+        }
     }
 
     public class WaybillItem : BaseObject