CSHARP-1891: Further changes to Distinct for backward compatibility.

rstam · rstam · commit c88d2fb41ecf · 2017-01-27T10:55:32.000-05:00
diff --git a/src/MongoDB.Driver/FieldDefinition.cs b/src/MongoDB.Driver/FieldDefinition.cs
@@ -1,4 +1,4 @@
-/* Copyright 2010-2016 MongoDB Inc.
+/* Copyright 2010-2017 MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -70,16 +70,22 @@ public sealed class RenderedFieldDefinition<TField>
     {
         private readonly string _fieldName;
         private readonly IBsonSerializer<TField> _fieldSerializer;
+        private readonly IBsonSerializer _underlyingSerializer;
+        private readonly IBsonSerializer<TField> _valueSerializer;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RenderedFieldDefinition{TField}" /> class.
         /// </summary>
         /// <param name="fieldName">The field name.</param>
         /// <param name="fieldSerializer">The field serializer.</param>
-        public RenderedFieldDefinition(string fieldName, IBsonSerializer<TField> fieldSerializer)
+        /// <param name="valueSerializer">The value serializer.</param>
+        /// <param name="underlyingSerializer">The underlying serializer.</param>
+        public RenderedFieldDefinition(string fieldName, IBsonSerializer<TField> fieldSerializer, IBsonSerializer<TField> valueSerializer, IBsonSerializer underlyingSerializer)
         {
             _fieldName = Ensure.IsNotNull(fieldName, nameof(fieldName));
-            _fieldSerializer = Ensure.IsNotNull(fieldSerializer, nameof(fieldSerializer));
+            _fieldSerializer = fieldSerializer;
+            _valueSerializer = Ensure.IsNotNull(valueSerializer, nameof(valueSerializer));
+            _underlyingSerializer = underlyingSerializer;
         }
 
         /// <summary>
@@ -97,6 +103,22 @@ public IBsonSerializer<TField> FieldSerializer
         {
             get { return _fieldSerializer; }
         }
+
+        /// <summary>
+        /// Gets the underlying serializer.
+        /// </summary>
+        public IBsonSerializer UnderlyingSerializer
+        {
+            get { return _underlyingSerializer; }
+        }
+
+        /// <summary>
+        /// Gets the value serializer.
+        /// </summary>
+        public IBsonSerializer<TField> ValueSerializer
+        {
+            get { return _valueSerializer; }
+        }
     }
 
     /// <summary>
@@ -273,9 +295,15 @@ public override RenderedFieldDefinition<TField> Render(IBsonSerializer<TDocument
                 throw new InvalidOperationException(message);
             }
 
-            var fieldSerializer = (IBsonSerializer<TField>)FieldValueSerializerHelper.GetSerializerForValueType(field.Serializer, typeof(TField));
+            var underlyingSerializer = field.Serializer;
+            var fieldSerializer = underlyingSerializer as IBsonSerializer<TField>;
+            var valueSerializer = (IBsonSerializer<TField>)FieldValueSerializerHelper.GetSerializerForValueType(underlyingSerializer, typeof(TField));
+            if (valueSerializer == null)
+            {
+                valueSerializer = serializerRegistry.GetSerializer<TField>();
+            }
 
-            return new RenderedFieldDefinition<TField>(field.FieldName, fieldSerializer);
+            return new RenderedFieldDefinition<TField>(field.FieldName, fieldSerializer, valueSerializer, underlyingSerializer);
         }
     }
 
@@ -332,20 +360,22 @@ public StringFieldDefinition(string fieldName, IBsonSerializer<TField> fieldSeri
         public override RenderedFieldDefinition<TField> Render(IBsonSerializer<TDocument> documentSerializer, IBsonSerializerRegistry serializerRegistry)
         {
             string resolvedName;
-            IBsonSerializer resolvedSerializer;
-            StringFieldDefinitionHelper.Resolve<TDocument>(_fieldName, documentSerializer, out resolvedName, out resolvedSerializer);
+            IBsonSerializer underlyingSerializer;
+            StringFieldDefinitionHelper.Resolve<TDocument>(_fieldName, documentSerializer, out resolvedName, out underlyingSerializer);
+
+            var fieldSerializer = underlyingSerializer as IBsonSerializer<TField>;
 
-            var fieldSerializer = _fieldSerializer;
-            if (fieldSerializer == null && resolvedSerializer != null)
+            var valueSerializer = _fieldSerializer;
+            if (valueSerializer == null && underlyingSerializer != null)
             {
-                fieldSerializer = (IBsonSerializer<TField>)FieldValueSerializerHelper.GetSerializerForValueType(resolvedSerializer, typeof(TField));
+                valueSerializer = (IBsonSerializer<TField>)FieldValueSerializerHelper.GetSerializerForValueType(underlyingSerializer, typeof(TField));
             }
-            if (fieldSerializer == null)
+            if (valueSerializer == null)
             {
-                fieldSerializer = serializerRegistry.GetSerializer<TField>();
+                valueSerializer = serializerRegistry.GetSerializer<TField>();
             }
 
-            return new RenderedFieldDefinition<TField>(resolvedName, fieldSerializer);
+            return new RenderedFieldDefinition<TField>(resolvedName, fieldSerializer, valueSerializer, underlyingSerializer);
         }
     }
 
@@ -355,6 +385,7 @@ public static void Resolve<TDocument>(string fieldName, IBsonSerializer<TDocumen
         {
             resolvedFieldName = fieldName;
             resolvedFieldSerializer = null;
+
             var documentSerializer = serializer as IBsonDocumentSerializer;
             if (documentSerializer == null)
             {
@@ -444,8 +475,7 @@ public UntypedFieldDefinitionAdapter(FieldDefinition<TDocument, TField> adaptee)
         public override RenderedFieldDefinition Render(IBsonSerializer<TDocument> documentSerializer, IBsonSerializerRegistry serializerRegistry)
         {
             var rendered = _adaptee.Render(documentSerializer, serializerRegistry);
-            return new RenderedFieldDefinition(rendered.FieldName, rendered.FieldSerializer);
+            return new RenderedFieldDefinition(rendered.FieldName, rendered.UnderlyingSerializer);
         }
     }
-
 }
diff --git a/src/MongoDB.Driver/FieldValueSerializerHelper.cs b/src/MongoDB.Driver/FieldValueSerializerHelper.cs
@@ -26,6 +26,11 @@ namespace MongoDB.Driver
     internal static class FieldValueSerializerHelper
     {
         public static IBsonSerializer GetSerializerForValueType(IBsonSerializer fieldSerializer, Type valueType)
+        {
+            return GetSerializerForValueType(fieldSerializer, valueType, 0);
+        }
+
+        private static IBsonSerializer GetSerializerForValueType(IBsonSerializer fieldSerializer, Type valueType, int recursionLevel)
         {
             var fieldType = fieldSerializer.ValueType;
 
@@ -102,8 +107,11 @@ public static IBsonSerializer GetSerializerForValueType(IBsonSerializer fieldSer
                 BsonSerializationInfo itemSerializationInfo;
                 if (arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))
                 {
-                    var itemSerializer = itemSerializationInfo.Serializer;
-                    return GetSerializerForValueType(itemSerializer, valueType);
+                    if (recursionLevel == 0)
+                    {
+                        var itemSerializer = itemSerializationInfo.Serializer;
+                        return GetSerializerForValueType(itemSerializer, valueType, recursionLevel + 1);
+                    }
                 }
             }
 
@@ -162,7 +170,16 @@ public EnumConvertingSerializer(IBsonSerializer<TTo> serializer)
 
             public override void Serialize(BsonSerializationContext context, BsonSerializationArgs args, TFrom value)
             {
-                _serializer.Serialize(context, args, (TTo)Enum.ToObject(typeof(TTo), (object)value));
+                TTo convertedValue;
+                if (typeof(TFrom) == typeof(string))
+                {
+                    convertedValue = (TTo)Enum.Parse(typeof(TTo), (string)(object)value);
+                }
+                else
+                {
+                    convertedValue = (TTo)Enum.ToObject(typeof(TTo), (object)value);
+                }
+                _serializer.Serialize(context, args, convertedValue);
             }
         }
 
diff --git a/src/MongoDB.Driver/FilterDefinitionBuilder.cs b/src/MongoDB.Driver/FilterDefinitionBuilder.cs
@@ -1586,7 +1586,7 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
             var renderedField = _field.Render(documentSerializer, serializerRegistry);
 
             IBsonSerializer itemSerializer = null;
-            if (itemSerializer == null && renderedField.FieldSerializer != null)
+            if (renderedField.FieldSerializer != null)
             {
                 var arraySerializer = renderedField.FieldSerializer as IBsonArraySerializer;
                 BsonSerializationInfo itemSerializationInfo;
@@ -2029,7 +2029,7 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
                 bsonWriter.WriteName(renderedField.FieldName);
                 bsonWriter.WriteStartDocument();
                 bsonWriter.WriteName(_operatorName);
-                renderedField.FieldSerializer.Serialize(context, _value);
+                renderedField.ValueSerializer.Serialize(context, _value);
                 bsonWriter.WriteEndDocument();
                 bsonWriter.WriteEndDocument();
             }
@@ -2115,7 +2115,7 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
                 var context = BsonSerializationContext.CreateRoot(bsonWriter);
                 bsonWriter.WriteStartDocument();
                 bsonWriter.WriteName(renderedField.FieldName);
-                renderedField.FieldSerializer.Serialize(context, _value);
+                renderedField.ValueSerializer.Serialize(context, _value);
                 bsonWriter.WriteEndDocument();
             }
 
@@ -2151,7 +2151,7 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
                 bsonWriter.WriteStartArray();
                 foreach (var value in _values)
                 {
-                    renderedField.FieldSerializer.Serialize(context, value);
+                    renderedField.ValueSerializer.Serialize(context, value);
                 }
                 bsonWriter.WriteEndArray();
                 bsonWriter.WriteEndDocument();
@@ -2180,7 +2180,7 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
             var renderedField = _field.Render(documentSerializer, serializerRegistry);
 
             IBsonSerializer itemSerializer = null;
-            if (itemSerializer == null && renderedField.FieldSerializer != null)
+            if (renderedField.FieldSerializer != null)
             {
                 var arraySerializer = renderedField.FieldSerializer as IBsonArraySerializer;
                 BsonSerializationInfo itemSerializationInfo;
@@ -2229,7 +2229,7 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
             var renderedField = _field.Render(documentSerializer, serializerRegistry);
 
             IBsonSerializer<TItem> itemSerializer = null;
-            if (itemSerializer == null && renderedField.FieldSerializer != null)
+            if (renderedField.FieldSerializer != null)
             {
                 var arraySerializer = renderedField.FieldSerializer as IBsonArraySerializer;
                 BsonSerializationInfo itemSerializationInfo;
@@ -2296,7 +2296,7 @@ public UInt32GreaterThanFilterDefinition(string operatorName, FieldDefinition<TD
         public override BsonDocument Render(IBsonSerializer<TDocument> documentSerializer, IBsonSerializerRegistry serializerRegistry)
         {
             var renderedField = _field.Render(documentSerializer, serializerRegistry);
-            var serializedValue = renderedField.FieldSerializer.ToBsonValue(_value);
+            var serializedValue = renderedField.ValueSerializer.ToBsonValue(_value);
 
             if (serializedValue.BsonType != BsonType.Int32)
             {
@@ -2348,7 +2348,7 @@ public UInt32LessThanFilterDefinition(string operatorName, FieldDefinition<TDocu
         public override BsonDocument Render(IBsonSerializer<TDocument> documentSerializer, IBsonSerializerRegistry serializerRegistry)
         {
             var renderedField = _field.Render(documentSerializer, serializerRegistry);
-            var serializedValue = renderedField.FieldSerializer.ToBsonValue(_value);
+            var serializedValue = renderedField.ValueSerializer.ToBsonValue(_value);
 
             if (serializedValue.BsonType != BsonType.Int32)
             {
@@ -2400,7 +2400,7 @@ public UInt64GreaterThanFilterDefinition(string operatorName, FieldDefinition<TD
         public override BsonDocument Render(IBsonSerializer<TDocument> documentSerializer, IBsonSerializerRegistry serializerRegistry)
         {
             var renderedField = _field.Render(documentSerializer, serializerRegistry);
-            var serializedValue = renderedField.FieldSerializer.ToBsonValue(_value);
+            var serializedValue = renderedField.ValueSerializer.ToBsonValue(_value);
 
             if (serializedValue.BsonType != BsonType.Int64)
             {
@@ -2452,7 +2452,7 @@ public UInt64LessThanFilterDefinition(string operatorName, FieldDefinition<TDocu
         public override BsonDocument Render(IBsonSerializer<TDocument> documentSerializer, IBsonSerializerRegistry serializerRegistry)
         {
             var renderedField = _field.Render(documentSerializer, serializerRegistry);
-            var serializedValue = renderedField.FieldSerializer.ToBsonValue(_value);
+            var serializedValue = renderedField.ValueSerializer.ToBsonValue(_value);
 
             if (serializedValue.BsonType != BsonType.Int64)
             {
diff --git a/src/MongoDB.Driver/MongoCollectionImpl.cs b/src/MongoDB.Driver/MongoCollectionImpl.cs
@@ -1,4 +1,4 @@
-/* Copyright 2010-2016 MongoDB Inc.
+/* Copyright 2010-2017 MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -563,9 +563,31 @@ private DistinctOperation<TField> CreateDistinctOperation<TField>(FieldDefinitio
         {
             var renderedField = field.Render(_documentSerializer, _settings.SerializerRegistry);
 
+            IBsonSerializer<TField> valueSerializer = null;
+            if (renderedField.UnderlyingSerializer != null)
+            {
+                IBsonArraySerializer arraySerializer;
+                BsonSerializationInfo itemSerializationInfo;
+                if (renderedField.UnderlyingSerializer.ValueType == typeof(TField))
+                {
+                    valueSerializer = (IBsonSerializer<TField>)renderedField.UnderlyingSerializer;
+                }
+                else if (
+                    (arraySerializer = renderedField.UnderlyingSerializer as IBsonArraySerializer) != null &&
+                    arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo) &&
+                    itemSerializationInfo.Serializer.ValueType == typeof(TField))
+                {
+                    valueSerializer = (IBsonSerializer<TField>)itemSerializationInfo.Serializer;
+                }
+            }
+            if (valueSerializer == null)
+            {
+                valueSerializer = _settings.SerializerRegistry.GetSerializer<TField>();
+            }
+
             return new DistinctOperation<TField>(
                 _collectionNamespace,
-                renderedField.FieldSerializer,
+                valueSerializer,
                 renderedField.FieldName,
                 _messageEncoderSettings)
             {
diff --git a/src/MongoDB.Driver/Support/ReflectionExtensions.cs b/src/MongoDB.Driver/Support/ReflectionExtensions.cs
@@ -85,7 +85,8 @@ public static bool IsConvertibleToEnum(this Type type)
                 type == typeof(ushort) ||
                 type == typeof(uint) ||
                 type == typeof(ulong) ||
-                type == typeof(Enum);
+                type == typeof(Enum) ||
+                type == typeof(string);
         }
 
         public static Type GetNullableUnderlyingType(this Type type)
diff --git a/src/MongoDB.Driver/UpdateDefinitionBuilder.cs b/src/MongoDB.Driver/UpdateDefinitionBuilder.cs
@@ -1,4 +1,4 @@
-/* Copyright 2010-2015 MongoDB Inc.
+/* Copyright 2010-2017 MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1448,7 +1448,7 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
                 bsonWriter.WriteName(renderedField.FieldName);
                 bsonWriter.WriteStartDocument();
                 bsonWriter.WriteName(_operatorName);
-                renderedField.FieldSerializer.Serialize(context, _value);
+                renderedField.ValueSerializer.Serialize(context, _value);
                 bsonWriter.WriteEndDocument();
                 bsonWriter.WriteEndDocument();
                 bsonWriter.WriteEndDocument();
@@ -1503,7 +1503,7 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
                 bsonWriter.WriteName(_operatorName);
                 bsonWriter.WriteStartDocument();
                 bsonWriter.WriteName(renderedField.FieldName);
-                renderedField.FieldSerializer.Serialize(context, _value);
+                renderedField.ValueSerializer.Serialize(context, _value);
                 bsonWriter.WriteEndDocument();
                 bsonWriter.WriteEndDocument();
             }
diff --git a/src/MongoDB.Shared/GlobalAssemblyInfo.cs b/src/MongoDB.Shared/GlobalAssemblyInfo.cs
@@ -17,8 +17,8 @@
 
 [assembly: AssemblyCompany("MongoDB Inc.")]
 [assembly: AssemblyCopyright("Copyright © 2010-2014 MongoDB Inc.")]
-[assembly: AssemblyVersion("2.4.2.11")]
-[assembly: AssemblyInformationalVersion("2.4.2-local-0011")]
-[assembly: AssemblyFileVersion("2.4.2.11")]
-[assembly: AssemblyMetadata("githash", "cf7accd4bd504d33adb74fc49a4ef9cfec499836")]
-[assembly: AssemblyConfiguration("Release")]
+[assembly: AssemblyVersion("0.0.*")]
+[assembly: AssemblyInformationalVersion("unofficial")]
+[assembly: AssemblyFileVersion("0.0.0.0")]
+[assembly: AssemblyMetadata("githash", "none")]
+[assembly: AssemblyConfiguration("Debug")]
diff --git a/tests/MongoDB.Driver.Tests/FieldDefinitionTests.cs b/tests/MongoDB.Driver.Tests/FieldDefinitionTests.cs
diff --git a/tests/MongoDB.Driver.Tests/FilterDefinitionBuilderTests.cs b/tests/MongoDB.Driver.Tests/FilterDefinitionBuilderTests.cs
diff --git a/tests/MongoDB.Driver.Tests/MongoCollectionImplTests.cs b/tests/MongoDB.Driver.Tests/MongoCollectionImplTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Copyright 2010-2016 MongoDB Inc.`
	`1`	`+/* Copyright 2010-2017 MongoDB Inc.`
`2`	`2`	`*`
`3`	`3`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`* you may not use this file except in compliance with the License.`
`@@ -70,16 +70,22 @@ public sealed class RenderedFieldDefinition<TField>`
`70`	`70`	`{`
`71`	`71`	`private readonly string _fieldName;`
`72`	`72`	`private readonly IBsonSerializer<TField> _fieldSerializer;`
	`73`	`+ private readonly IBsonSerializer _underlyingSerializer;`
	`74`	`+ private readonly IBsonSerializer<TField> _valueSerializer;`
`73`	`75`
`74`	`76`	`/// <summary>`
`75`	`77`	`/// Initializes a new instance of the <see cref="RenderedFieldDefinition{TField}" /> class.`
`76`	`78`	`/// </summary>`
`77`	`79`	`/// <param name="fieldName">The field name.</param>`
`78`	`80`	`/// <param name="fieldSerializer">The field serializer.</param>`
`79`		`- public RenderedFieldDefinition(string fieldName, IBsonSerializer<TField> fieldSerializer)`
	`81`	`+ /// <param name="valueSerializer">The value serializer.</param>`
	`82`	`+ /// <param name="underlyingSerializer">The underlying serializer.</param>`
	`83`	`+ public RenderedFieldDefinition(string fieldName, IBsonSerializer<TField> fieldSerializer, IBsonSerializer<TField> valueSerializer, IBsonSerializer underlyingSerializer)`
`80`	`84`	`{`
`81`	`85`	`_fieldName = Ensure.IsNotNull(fieldName, nameof(fieldName));`
`82`		`- _fieldSerializer = Ensure.IsNotNull(fieldSerializer, nameof(fieldSerializer));`
	`86`	`+ _fieldSerializer = fieldSerializer;`
	`87`	`+ _valueSerializer = Ensure.IsNotNull(valueSerializer, nameof(valueSerializer));`
	`88`	`+ _underlyingSerializer = underlyingSerializer;`
`83`	`89`	`}`
`84`	`90`
`85`	`91`	`/// <summary>`
`@@ -97,6 +103,22 @@ public IBsonSerializer<TField> FieldSerializer`
`97`	`103`	`{`
`98`	`104`	`get { return _fieldSerializer; }`
`99`	`105`	`}`
	`106`	`+`
	`107`	`+ /// <summary>`
	`108`	`+ /// Gets the underlying serializer.`
	`109`	`+ /// </summary>`
	`110`	`+ public IBsonSerializer UnderlyingSerializer`
	`111`	`+ {`
	`112`	`+ get { return _underlyingSerializer; }`
	`113`	`+ }`
	`114`	`+`
	`115`	`+ /// <summary>`
	`116`	`+ /// Gets the value serializer.`
	`117`	`+ /// </summary>`
	`118`	`+ public IBsonSerializer<TField> ValueSerializer`
	`119`	`+ {`
	`120`	`+ get { return _valueSerializer; }`
	`121`	`+ }`
`100`	`122`	`}`
`101`	`123`
`102`	`124`	`/// <summary>`
`@@ -273,9 +295,15 @@ public override RenderedFieldDefinition<TField> Render(IBsonSerializer<TDocument`
`273`	`295`	`throw new InvalidOperationException(message);`
`274`	`296`	`}`
`275`	`297`
`276`		`- var fieldSerializer = (IBsonSerializer<TField>)FieldValueSerializerHelper.GetSerializerForValueType(field.Serializer, typeof(TField));`
	`298`	`+ var underlyingSerializer = field.Serializer;`
	`299`	`+ var fieldSerializer = underlyingSerializer as IBsonSerializer<TField>;`
	`300`	`+ var valueSerializer = (IBsonSerializer<TField>)FieldValueSerializerHelper.GetSerializerForValueType(underlyingSerializer, typeof(TField));`
	`301`	`+ if (valueSerializer == null)`
	`302`	`+ {`
	`303`	`+ valueSerializer = serializerRegistry.GetSerializer<TField>();`
	`304`	`+ }`
`277`	`305`
`278`		`- return new RenderedFieldDefinition<TField>(field.FieldName, fieldSerializer);`
	`306`	`+ return new RenderedFieldDefinition<TField>(field.FieldName, fieldSerializer, valueSerializer, underlyingSerializer);`
`279`	`307`	`}`
`280`	`308`	`}`
`281`	`309`
`@@ -332,20 +360,22 @@ public StringFieldDefinition(string fieldName, IBsonSerializer<TField> fieldSeri`
`332`	`360`	`public override RenderedFieldDefinition<TField> Render(IBsonSerializer<TDocument> documentSerializer, IBsonSerializerRegistry serializerRegistry)`
`333`	`361`	`{`
`334`	`362`	`string resolvedName;`
`335`		`- IBsonSerializer resolvedSerializer;`
`336`		`- StringFieldDefinitionHelper.Resolve<TDocument>(_fieldName, documentSerializer, out resolvedName, out resolvedSerializer);`
	`363`	`+ IBsonSerializer underlyingSerializer;`
	`364`	`+ StringFieldDefinitionHelper.Resolve<TDocument>(_fieldName, documentSerializer, out resolvedName, out underlyingSerializer);`
	`365`	`+`
	`366`	`+ var fieldSerializer = underlyingSerializer as IBsonSerializer<TField>;`
`337`	`367`
`338`		`- var fieldSerializer = _fieldSerializer;`
`339`		`- if (fieldSerializer == null && resolvedSerializer != null)`
	`368`	`+ var valueSerializer = _fieldSerializer;`
	`369`	`+ if (valueSerializer == null && underlyingSerializer != null)`
`340`	`370`	`{`
`341`		`- fieldSerializer = (IBsonSerializer<TField>)FieldValueSerializerHelper.GetSerializerForValueType(resolvedSerializer, typeof(TField));`
	`371`	`+ valueSerializer = (IBsonSerializer<TField>)FieldValueSerializerHelper.GetSerializerForValueType(underlyingSerializer, typeof(TField));`
`342`	`372`	`}`
`343`		`- if (fieldSerializer == null)`
	`373`	`+ if (valueSerializer == null)`
`344`	`374`	`{`
`345`		`- fieldSerializer = serializerRegistry.GetSerializer<TField>();`
	`375`	`+ valueSerializer = serializerRegistry.GetSerializer<TField>();`
`346`	`376`	`}`
`347`	`377`
`348`		`- return new RenderedFieldDefinition<TField>(resolvedName, fieldSerializer);`
	`378`	`+ return new RenderedFieldDefinition<TField>(resolvedName, fieldSerializer, valueSerializer, underlyingSerializer);`
`349`	`379`	`}`
`350`	`380`	`}`
`351`	`381`
`@@ -355,6 +385,7 @@ public static void Resolve<TDocument>(string fieldName, IBsonSerializer<TDocumen`
`355`	`385`	`{`
`356`	`386`	`resolvedFieldName = fieldName;`
`357`	`387`	`resolvedFieldSerializer = null;`
	`388`	`+`
`358`	`389`	`var documentSerializer = serializer as IBsonDocumentSerializer;`
`359`	`390`	`if (documentSerializer == null)`
`360`	`391`	`{`
`@@ -444,8 +475,7 @@ public UntypedFieldDefinitionAdapter(FieldDefinition<TDocument, TField> adaptee)`
`444`	`475`	`public override RenderedFieldDefinition Render(IBsonSerializer<TDocument> documentSerializer, IBsonSerializerRegistry serializerRegistry)`
`445`	`476`	`{`
`446`	`477`	`var rendered = _adaptee.Render(documentSerializer, serializerRegistry);`
`447`		`- return new RenderedFieldDefinition(rendered.FieldName, rendered.FieldSerializer);`
	`478`	`+ return new RenderedFieldDefinition(rendered.FieldName, rendered.UnderlyingSerializer);`
`448`	`479`	`}`
`449`	`480`	`}`
`450`		`-`
`451`	`481`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,11 @@ namespace MongoDB.Driver`
`26`	`26`	`internal static class FieldValueSerializerHelper`
`27`	`27`	`{`
`28`	`28`	`public static IBsonSerializer GetSerializerForValueType(IBsonSerializer fieldSerializer, Type valueType)`
	`29`	`+ {`
	`30`	`+ return GetSerializerForValueType(fieldSerializer, valueType, 0);`
	`31`	`+ }`
	`32`	`+`
	`33`	`+ private static IBsonSerializer GetSerializerForValueType(IBsonSerializer fieldSerializer, Type valueType, int recursionLevel)`
`29`	`34`	`{`
`30`	`35`	`var fieldType = fieldSerializer.ValueType;`
`31`	`36`
`@@ -102,8 +107,11 @@ public static IBsonSerializer GetSerializerForValueType(IBsonSerializer fieldSer`
`102`	`107`	`BsonSerializationInfo itemSerializationInfo;`
`103`	`108`	`if (arraySerializer.TryGetItemSerializationInfo(out itemSerializationInfo))`
`104`	`109`	`{`
`105`		`- var itemSerializer = itemSerializationInfo.Serializer;`
`106`		`- return GetSerializerForValueType(itemSerializer, valueType);`
	`110`	`+ if (recursionLevel == 0)`
	`111`	`+ {`
	`112`	`+ var itemSerializer = itemSerializationInfo.Serializer;`
	`113`	`+ return GetSerializerForValueType(itemSerializer, valueType, recursionLevel + 1);`
	`114`	`+ }`
`107`	`115`	`}`
`108`	`116`	`}`
`109`	`117`
`@@ -162,7 +170,16 @@ public EnumConvertingSerializer(IBsonSerializer<TTo> serializer)`
`162`	`170`
`163`	`171`	`public override void Serialize(BsonSerializationContext context, BsonSerializationArgs args, TFrom value)`
`164`	`172`	`{`
`165`		`- _serializer.Serialize(context, args, (TTo)Enum.ToObject(typeof(TTo), (object)value));`
	`173`	`+ TTo convertedValue;`
	`174`	`+ if (typeof(TFrom) == typeof(string))`
	`175`	`+ {`
	`176`	`+ convertedValue = (TTo)Enum.Parse(typeof(TTo), (string)(object)value);`
	`177`	`+ }`
	`178`	`+ else`
	`179`	`+ {`
	`180`	`+ convertedValue = (TTo)Enum.ToObject(typeof(TTo), (object)value);`
	`181`	`+ }`
	`182`	`+ _serializer.Serialize(context, args, convertedValue);`
`166`	`183`	`}`
`167`	`184`	`}`
`168`	`185`
Original file line number	Diff line number	Diff line change
`@@ -1586,7 +1586,7 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize`
`1586`	`1586`	`var renderedField = _field.Render(documentSerializer, serializerRegistry);`
`1587`	`1587`
`1588`	`1588`	`IBsonSerializer itemSerializer = null;`
`1589`		`- if (itemSerializer == null && renderedField.FieldSerializer != null)`
	`1589`	`+ if (renderedField.FieldSerializer != null)`
`1590`	`1590`	`{`
`1591`	`1591`	`var arraySerializer = renderedField.FieldSerializer as IBsonArraySerializer;`
`1592`	`1592`	`BsonSerializationInfo itemSerializationInfo;`
`@@ -2029,7 +2029,7 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize`
`2029`	`2029`	`bsonWriter.WriteName(renderedField.FieldName);`
`2030`	`2030`	`bsonWriter.WriteStartDocument();`
`2031`	`2031`	`bsonWriter.WriteName(_operatorName);`
`2032`		`- renderedField.FieldSerializer.Serialize(context, _value);`
	`2032`	`+ renderedField.ValueSerializer.Serialize(context, _value);`
`2033`	`2033`	`bsonWriter.WriteEndDocument();`
`2034`	`2034`	`bsonWriter.WriteEndDocument();`
`2035`	`2035`	`}`
`@@ -2115,7 +2115,7 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize`
`2115`	`2115`	`var context = BsonSerializationContext.CreateRoot(bsonWriter);`
`2116`	`2116`	`bsonWriter.WriteStartDocument();`
`2117`	`2117`	`bsonWriter.WriteName(renderedField.FieldName);`
`2118`		`- renderedField.FieldSerializer.Serialize(context, _value);`
	`2118`	`+ renderedField.ValueSerializer.Serialize(context, _value);`
`2119`	`2119`	`bsonWriter.WriteEndDocument();`
`2120`	`2120`	`}`
`2121`	`2121`
`@@ -2151,7 +2151,7 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize`
`2151`	`2151`	`bsonWriter.WriteStartArray();`
`2152`	`2152`	`foreach (var value in _values)`
`2153`	`2153`	`{`
`2154`		`- renderedField.FieldSerializer.Serialize(context, value);`
	`2154`	`+ renderedField.ValueSerializer.Serialize(context, value);`
`2155`	`2155`	`}`
`2156`	`2156`	`bsonWriter.WriteEndArray();`
`2157`	`2157`	`bsonWriter.WriteEndDocument();`
`@@ -2180,7 +2180,7 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize`
`2180`	`2180`	`var renderedField = _field.Render(documentSerializer, serializerRegistry);`
`2181`	`2181`
`2182`	`2182`	`IBsonSerializer itemSerializer = null;`
`2183`		`- if (itemSerializer == null && renderedField.FieldSerializer != null)`
	`2183`	`+ if (renderedField.FieldSerializer != null)`
`2184`	`2184`	`{`
`2185`	`2185`	`var arraySerializer = renderedField.FieldSerializer as IBsonArraySerializer;`
`2186`	`2186`	`BsonSerializationInfo itemSerializationInfo;`
`@@ -2229,7 +2229,7 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize`
`2229`	`2229`	`var renderedField = _field.Render(documentSerializer, serializerRegistry);`
`2230`	`2230`
`2231`	`2231`	`IBsonSerializer<TItem> itemSerializer = null;`
`2232`		`- if (itemSerializer == null && renderedField.FieldSerializer != null)`
	`2232`	`+ if (renderedField.FieldSerializer != null)`
`2233`	`2233`	`{`
`2234`	`2234`	`var arraySerializer = renderedField.FieldSerializer as IBsonArraySerializer;`
`2235`	`2235`	`BsonSerializationInfo itemSerializationInfo;`
`@@ -2296,7 +2296,7 @@ public UInt32GreaterThanFilterDefinition(string operatorName, FieldDefinition<TD`
`2296`	`2296`	`public override BsonDocument Render(IBsonSerializer<TDocument> documentSerializer, IBsonSerializerRegistry serializerRegistry)`
`2297`	`2297`	`{`
`2298`	`2298`	`var renderedField = _field.Render(documentSerializer, serializerRegistry);`
`2299`		`- var serializedValue = renderedField.FieldSerializer.ToBsonValue(_value);`
	`2299`	`+ var serializedValue = renderedField.ValueSerializer.ToBsonValue(_value);`
`2300`	`2300`
`2301`	`2301`	`if (serializedValue.BsonType != BsonType.Int32)`
`2302`	`2302`	`{`
`@@ -2348,7 +2348,7 @@ public UInt32LessThanFilterDefinition(string operatorName, FieldDefinition<TDocu`
`2348`	`2348`	`public override BsonDocument Render(IBsonSerializer<TDocument> documentSerializer, IBsonSerializerRegistry serializerRegistry)`
`2349`	`2349`	`{`
`2350`	`2350`	`var renderedField = _field.Render(documentSerializer, serializerRegistry);`
`2351`		`- var serializedValue = renderedField.FieldSerializer.ToBsonValue(_value);`
	`2351`	`+ var serializedValue = renderedField.ValueSerializer.ToBsonValue(_value);`
`2352`	`2352`
`2353`	`2353`	`if (serializedValue.BsonType != BsonType.Int32)`
`2354`	`2354`	`{`
`@@ -2400,7 +2400,7 @@ public UInt64GreaterThanFilterDefinition(string operatorName, FieldDefinition<TD`
`2400`	`2400`	`public override BsonDocument Render(IBsonSerializer<TDocument> documentSerializer, IBsonSerializerRegistry serializerRegistry)`
`2401`	`2401`	`{`
`2402`	`2402`	`var renderedField = _field.Render(documentSerializer, serializerRegistry);`
`2403`		`- var serializedValue = renderedField.FieldSerializer.ToBsonValue(_value);`
	`2403`	`+ var serializedValue = renderedField.ValueSerializer.ToBsonValue(_value);`
`2404`	`2404`
`2405`	`2405`	`if (serializedValue.BsonType != BsonType.Int64)`
`2406`	`2406`	`{`
`@@ -2452,7 +2452,7 @@ public UInt64LessThanFilterDefinition(string operatorName, FieldDefinition<TDocu`
`2452`	`2452`	`public override BsonDocument Render(IBsonSerializer<TDocument> documentSerializer, IBsonSerializerRegistry serializerRegistry)`
`2453`	`2453`	`{`
`2454`	`2454`	`var renderedField = _field.Render(documentSerializer, serializerRegistry);`
`2455`		`- var serializedValue = renderedField.FieldSerializer.ToBsonValue(_value);`
	`2455`	`+ var serializedValue = renderedField.ValueSerializer.ToBsonValue(_value);`
`2456`	`2456`
`2457`	`2457`	`if (serializedValue.BsonType != BsonType.Int64)`
`2458`	`2458`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,8 @@ public static bool IsConvertibleToEnum(this Type type)`
`85`	`85`	`type == typeof(ushort) \|\|`
`86`	`86`	`type == typeof(uint) \|\|`
`87`	`87`	`type == typeof(ulong) \|\|`
`88`		`- type == typeof(Enum);`
	`88`	`+ type == typeof(Enum) \|\|`
	`89`	`+ type == typeof(string);`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`public static Type GetNullableUnderlyingType(this Type type)`