PULL-120: Changed the new support for & and | in LINQ queries to check that the parameters to & and | are of type bool.

Author: rstam

Driver/Linq/Translators/PredicateTranslator.cs

@@ -61,9 +61,11 @@ public IMongoQuery BuildQuery(Expression expression)
             switch (expression.NodeType)
             {
                 case ExpressionType.And:
-                case ExpressionType.AndAlso:
                     query = BuildAndQuery((BinaryExpression)expression);
                     break;
+                case ExpressionType.AndAlso:
+                    query = BuildAndAlsoQuery((BinaryExpression)expression);
+                    break;
                 case ExpressionType.ArrayIndex:
                     query = BuildBooleanQuery(expression);
                     break;
@@ -88,9 +90,11 @@ public IMongoQuery BuildQuery(Expression expression)
                     query = BuildNotQuery((UnaryExpression)expression);
                     break;
                 case ExpressionType.Or:
-                case ExpressionType.OrElse:
                     query = BuildOrQuery((BinaryExpression)expression);
                     break;
+                case ExpressionType.OrElse:
+                    query = BuildOrElseQuery((BinaryExpression)expression);
+                    break;
                 case ExpressionType.TypeIs:
                     query = BuildTypeIsQuery((TypeBinaryExpression)expression);
                     break;
@@ -106,11 +110,21 @@ public IMongoQuery BuildQuery(Expression expression)
         }
 
         // private methods
-        private IMongoQuery BuildAndQuery(BinaryExpression binaryExpression)
+        private IMongoQuery BuildAndAlsoQuery(BinaryExpression binaryExpression)
         {
             return Query.And(BuildQuery(binaryExpression.Left), BuildQuery(binaryExpression.Right));
         }
 
+        private IMongoQuery BuildAndQuery(BinaryExpression binaryExpression)
+        {
+            if (binaryExpression.Left.Type == typeof(bool) && binaryExpression.Right.Type == typeof(bool))
+            {
+                return BuildAndAlsoQuery(binaryExpression);
+            }
+
+            return null;
+        }
+
         private IMongoQuery BuildAnyQuery(MethodCallExpression methodCallExpression)
         {
             if (methodCallExpression.Method.DeclaringType == typeof(Enumerable))
@@ -775,11 +789,21 @@ private IMongoQuery BuildNotQuery(UnaryExpression unaryExpression)
             return Query.Not(queryDocument);
         }
 
-        private IMongoQuery BuildOrQuery(BinaryExpression binaryExpression)
+        private IMongoQuery BuildOrElseQuery(BinaryExpression binaryExpression)
         {
             return Query.Or(BuildQuery(binaryExpression.Left), BuildQuery(binaryExpression.Right));
         }
 
+        private IMongoQuery BuildOrQuery(BinaryExpression binaryExpression)
+        {
+            if (binaryExpression.Left.Type == typeof(bool) && binaryExpression.Right.Type == typeof(bool))
+            {
+                return BuildOrElseQuery(binaryExpression);
+            }
+
+            return null;
+        }
+
         private IMongoQuery BuildStringIndexOfQuery(Expression variableExpression, ExpressionType operatorType, ConstantExpression constantExpression)
         {
             // TODO: support other comparison operators