CSHARP-4723: Linq V2 Projection when upgrading from 2.19.1 to 2.19.2 (#1144)

Author: sanych-sun

src/MongoDB.Driver/MongoCollectionImpl.cs

@@ -987,7 +987,7 @@ private EstimatedDocumentCountOperation CreateEstimatedDocumentCountOperation(Es
         private FindOneAndDeleteOperation<TProjection> CreateFindOneAndDeleteOperation<TProjection>(FilterDefinition<TDocument> filter, FindOneAndDeleteOptions<TDocument, TProjection> options)
         {
             var projection = options.Projection ?? new ClientSideDeserializationProjectionDefinition<TDocument, TProjection>();
-            var renderedProjection = projection.Render(_documentSerializer, _settings.SerializerRegistry, _linqProvider);
+            var renderedProjection = projection.RenderForFind(_documentSerializer, _settings.SerializerRegistry, _linqProvider);
 
             return new FindOneAndDeleteOperation<TProjection>(
                 _collectionNamespace,
@@ -1010,7 +1010,7 @@ private FindOneAndDeleteOperation<TProjection> CreateFindOneAndDeleteOperation<T
         private FindOneAndReplaceOperation<TProjection> CreateFindOneAndReplaceOperation<TProjection>(FilterDefinition<TDocument> filter, object replacementObject, FindOneAndReplaceOptions<TDocument, TProjection> options)
         {
             var projection = options.Projection ?? new ClientSideDeserializationProjectionDefinition<TDocument, TProjection>();
-            var renderedProjection = projection.Render(_documentSerializer, _settings.SerializerRegistry, _linqProvider);
+            var renderedProjection = projection.RenderForFind(_documentSerializer, _settings.SerializerRegistry, _linqProvider);
 
             return new FindOneAndReplaceOperation<TProjection>(
                 _collectionNamespace,
@@ -1037,7 +1037,7 @@ private FindOneAndReplaceOperation<TProjection> CreateFindOneAndReplaceOperation
         private FindOneAndUpdateOperation<TProjection> CreateFindOneAndUpdateOperation<TProjection>(FilterDefinition<TDocument> filter, UpdateDefinition<TDocument> update, FindOneAndUpdateOptions<TDocument, TProjection> options)
         {
             var projection = options.Projection ?? new ClientSideDeserializationProjectionDefinition<TDocument, TProjection>();
-            var renderedProjection = projection.Render(_documentSerializer, _settings.SerializerRegistry, _linqProvider);
+            var renderedProjection = projection.RenderForFind(_documentSerializer, _settings.SerializerRegistry, _linqProvider);
 
             return new FindOneAndUpdateOperation<TProjection>(
                 _collectionNamespace,

tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp4723Tests.cs

@@ -0,0 +1,95 @@
+/* Copyright 2010-present MongoDB Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+using FluentAssertions;
+using MongoDB.Driver.Linq;
+using MongoDB.TestHelpers.XunitExtensions;
+using Xunit;
+
+namespace MongoDB.Driver.Tests.Linq.Linq3Implementation.Jira
+{
+    public class CSharp4723Tests : Linq3IntegrationTest
+    {
+        [Theory]
+        [ParameterAttributeData]
+        public void Find_projection_in_findoneandupdate_should_work(
+            [Values(LinqProvider.V2, LinqProvider.V3)] LinqProvider linqProvider)
+        {
+            var collection = GetCollection(linqProvider);
+
+            var update = Builders<A>.Update.Set("Value", "updated");
+            var options = new FindOneAndUpdateOptions<A>
+            {
+                Projection = Builders<A>.Projection.Expression(x => x)
+            };
+
+            var result = collection.FindOneAndUpdate<A, A>(x => x.Id == 1, update, options);
+
+            result.Id.Should().Be(1);
+            result.Value.Should().Be("1");
+        }
+
+        [Theory]
+        [ParameterAttributeData]
+        public void Find_projection_in_findoneandreplace_should_work(
+            [Values(LinqProvider.V2, LinqProvider.V3)] LinqProvider linqProvider)
+        {
+            var collection = GetCollection(linqProvider);
+            var options = new FindOneAndReplaceOptions<A, A>
+            {
+                Projection = Builders<A>.Projection.Expression(x => x)
+            };
+
+            var result = collection.FindOneAndReplace<A, A>(x => x.Id == 1, new A { Id = 1, Value = "updated" }, options);
+
+            result.Id.Should().Be(1);
+            result.Value.Should().Be("1");
+        }
+
+        [Theory]
+        [ParameterAttributeData]
+        public void Find_projection_in_findoneanddelete_should_work(
+            [Values(LinqProvider.V2, LinqProvider.V3)] LinqProvider linqProvider)
+        {
+            var collection = GetCollection(linqProvider);
+
+            var options = new FindOneAndDeleteOptions<A>
+            {
+                Projection = Builders<A>.Projection.Expression(x => x),
+            };
+
+            var result = collection.FindOneAndDelete<A, A>(x => x.Id == 1, options);
+
+            result.Id.Should().Be(1);
+            result.Value.Should().Be("1");
+        }
+
+        private IMongoCollection<A> GetCollection(LinqProvider linqProvider)
+        {
+            var collection = GetCollection<A>("test", linqProvider);
+            CreateCollection(
+                collection,
+                new A { Id = 1, Value = "1"});
+            return collection;
+        }
+
+        private class A
+        {
+            public int Id { get; set; }
+
+            public string Value { get; set; }
+        }
+    }
+}