Merged pull request for CSHARP-413 with minor changes.

Author: rstam

Driver/Linq/Translators/SelectQuery.cs

@@ -250,14 +250,7 @@ private IMongoQuery BuildAnyQuery(MethodCallExpression methodCallExpression)
             {
                 var arguments = methodCallExpression.Arguments.ToArray();
                 var serializationInfo = GetSerializationInfo(arguments[0]);
-                var itemSerializerProvider = serializationInfo.Serializer as IBsonItemSerializationInfoProvider;
-                if (itemSerializerProvider == null)
-                {
-                    return null;
-                }
-
-                var itemSerializationInfo = itemSerializerProvider.GetItemSerializationInfo();
-                if (itemSerializationInfo == null)
+                if (serializationInfo == null)
                 {
                     return null;
                 }
@@ -270,6 +263,18 @@ private IMongoQuery BuildAnyQuery(MethodCallExpression methodCallExpression)
                 }
                 else if (arguments.Length == 2)
                 {
+                    var itemSerializationInfoProvider = serializationInfo.Serializer as IBsonItemSerializationInfoProvider;
+                    if (itemSerializationInfoProvider == null)
+                    {
+                        return null;
+                    }
+
+                    var itemSerializationInfo = itemSerializationInfoProvider.GetItemSerializationInfo();
+                    if (itemSerializationInfo == null)
+                    {
+                        return null;
+                    }
+
                     if (!(itemSerializationInfo.Serializer is IBsonMemberSerializationInfoProvider))
                     {
                         var message = string.Format("Any is only support for items that serialize into documents. The current serializer is {0} and must implement {1} for participation in Any queries.",
@@ -1506,8 +1511,11 @@ private BsonSerializationInfo GetSerializationInfo(Expression expression)
             if (parameterExpression != null)
             {
                 IBsonSerializer serializer;
-                if(!_parameterSerializers.TryGetValue(parameterExpression, out serializer))
+                if (!_parameterSerializers.TryGetValue(parameterExpression, out serializer))
+                {
                     serializer = BsonSerializer.LookupSerializer(parameterExpression.Type);
+                }
+
                 return new BsonSerializationInfo(
                     null, // elementName
                     serializer,

DriverUnitTests/Linq/SelectQueryTests.cs

@@ -3053,7 +3053,7 @@ public void TestWhereDNotEquals11Not()
         public void TestWhereDAAnyWithPredicate()
         {
             var query = from c in _collection.AsQueryable<C>()
-                        where c.DA.Any(x => x.Z == 333)
+                        where c.DA.Any(d => d.Z == 333)
                         select c;
 
             var translatedQuery = MongoQueryTranslator.Translate(query);
@@ -3062,7 +3062,7 @@ where c.DA.Any(x => x.Z == 333)
             Assert.AreSame(typeof(C), translatedQuery.DocumentType);
 
             var selectQuery = (SelectQuery)translatedQuery;
-            Assert.AreEqual("(C c) => Enumerable.Any<D>(c.DA, (D x) => (x.Z == 333))", ExpressionFormatter.ToString(selectQuery.Where));
+            Assert.AreEqual("(C c) => Enumerable.Any<D>(c.DA, (D d) => (d.Z == 333))", ExpressionFormatter.ToString(selectQuery.Where));
             Assert.IsNull(selectQuery.OrderBy);
             Assert.IsNull(selectQuery.Projection);
             Assert.IsNull(selectQuery.Skip);