CSHARP-1890: Be more flexible in what types are valid for filter builder value arguments.

Author: rstam

src/MongoDB.Driver/FilterDefinitionBuilder.cs

@@ -2179,8 +2179,8 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
         {
             var renderedField = _field.Render(documentSerializer, serializerRegistry);
 
-            IBsonSerializer itemSerializer;
-            if (renderedField.FieldSerializer != null)
+            IBsonSerializer itemSerializer = null;
+            if (itemSerializer == null && renderedField.FieldSerializer != null)
             {
                 var arraySerializer = renderedField.FieldSerializer as IBsonArraySerializer;
                 BsonSerializationInfo itemSerializationInfo;
@@ -2189,9 +2189,9 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
                     var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer and provide item serialization info.", renderedField.FieldName);
                     throw new InvalidOperationException(message);
                 }
-                itemSerializer = itemSerializationInfo.Serializer;
+                itemSerializer = FieldValueSerializerHelper.GetSerializerForValueType(itemSerializationInfo.Serializer, typeof(TItem));
             }
-            else
+            if (itemSerializer == null)
             {
                 itemSerializer = serializerRegistry.GetSerializer<TItem>();
             }
@@ -2228,8 +2228,8 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
         {
             var renderedField = _field.Render(documentSerializer, serializerRegistry);
 
-            IBsonSerializer<TItem> itemSerializer;
-            if (renderedField.FieldSerializer != null)
+            IBsonSerializer<TItem> itemSerializer = null;
+            if (itemSerializer == null && renderedField.FieldSerializer != null)
             {
                 var arraySerializer = renderedField.FieldSerializer as IBsonArraySerializer;
                 BsonSerializationInfo itemSerializationInfo;
@@ -2238,9 +2238,9 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
                     var message = string.Format("The serializer for field '{0}' must implement IBsonArraySerializer and provide item serialization info.", renderedField.FieldName);
                     throw new InvalidOperationException(message);
                 }
-                itemSerializer = (IBsonSerializer<TItem>)itemSerializationInfo.Serializer;
+                itemSerializer = (IBsonSerializer<TItem>)FieldValueSerializerHelper.GetSerializerForValueType(itemSerializationInfo.Serializer, typeof(TItem));
             }
-            else
+            if (itemSerializer == null)
             {
                 itemSerializer = serializerRegistry.GetSerializer<TItem>();
             }

tests/MongoDB.Driver.Tests/FilterDefinitionBuilderTests.cs

@@ -271,6 +271,33 @@ public void Eq_Typed()
             Assert(subject.AnyEq("FavoriteColors", "yellow"), "{colors: 'yellow'}");
         }
 
+        [Fact]
+        public void Eq_with_enums()
+        {
+            var subject = CreateSubject<BsonDocument>();
+
+            Assert(subject.Eq("E", EnumForClassWithEnums.A), "{ E : 0 }");
+            Assert(subject.AnyEq("A", EnumForClassWithEnums.A), "{ A : 0 }");
+        }
+
+        [Fact]
+        public void Eq_with_enums_typed()
+        {
+            var subject = CreateSubject<ClassWithEnums>();
+
+            Assert(subject.Eq("E", 0), "{ E : \"A\" }");
+            Assert(subject.Eq("A", 0), "{ A : \"A\" }");
+            Assert(subject.AnyEq("A", 0), "{ A : \"A\" }");
+
+            Assert(subject.Eq("E", "X"), "{ E : \"X\" }");
+            Assert(subject.Eq("A", "X"), "{ A : \"X\" }");
+            Assert(subject.AnyEq("A", "X"), "{ A : \"X\" }");
+
+            Assert(subject.Eq("E", EnumForClassWithEnums.A), "{ E : \"A\" }");
+            Assert(subject.Eq("A", EnumForClassWithEnums.A), "{ A : \"A\" }");
+            Assert(subject.AnyEq("A", EnumForClassWithEnums.A), "{ A : \"A\" }");
+        }
+
         [Fact]
         public void Exists()
         {
@@ -501,17 +528,17 @@ public void In_with_enum()
         }
 
         [Fact]
-        public void In_typed_with_enum()
+        public void In_with_enum_typed()
         {
             var subject = CreateSubject<ClassWithEnums>();
 
             Assert(subject.In("E", new[] { 0, 1 }), "{ E : { $in : [ \"A\", \"B\" ] } }");
             Assert(subject.In("A", new[] { 0, 1 }), "{ A : { $in : [ \"A\", \"B\" ] } }");
             Assert(subject.AnyIn("A", new[] { 0, 1 }), "{ A : { $in : [ \"A\", \"B\" ] } }");
 
-            Assert(subject.In("E", new[] { "A", "B" }), "{ E : { $in : [ \"A\", \"B\" ] } }");
-            Assert(subject.In("A", new[] { "A", "B" }), "{ A : { $in : [ \"A\", \"B\" ] } }");
-            Assert(subject.AnyIn("A", new[] { "A", "B" }), "{ A : { $in : [ \"A\", \"B\" ] } }");
+            Assert(subject.In("E", new[] { "X", "Y" }), "{ E : { $in : [ \"X\", \"Y\" ] } }");
+            Assert(subject.In("A", new[] { "X", "Y" }), "{ A : { $in : [ \"X\", \"Y\" ] } }");
+            Assert(subject.AnyIn("A", new[] { "X", "Y" }), "{ A : { $in : [ \"X\", \"Y\" ] } }");
 
             Assert(subject.In("E", new[] { EnumForClassWithEnums.A, EnumForClassWithEnums.B }), "{ E : { $in : [ \"A\", \"B\" ] } }");
             Assert(subject.In("A", new[] { EnumForClassWithEnums.A, EnumForClassWithEnums.B }), "{ A : { $in : [ \"A\", \"B\" ] } }");