Work in progress.

rstam · rstam · commit cadbca5cdf00 · 2025-09-26T13:43:25.000-07:00
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/KnownSerializerFinders/KnownSerializerFinderVisitBinary.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/KnownSerializerFinders/KnownSerializerFinderVisitBinary.cs
@@ -71,7 +71,21 @@ protected override Expression VisitBinary(BinaryExpression node)
             if (IsNotKnown(node) &&
                 IsKnown(leftExpression, out var leftSerializer))
             {
-                AddKnownSerializer(node, leftSerializer);
+                if (leftSerializer.ValueType == node.Type)
+                {
+                    AddKnownSerializer(node, leftSerializer);
+                }
+                else if (
+                    leftSerializer is INullableSerializer nullableSerializer &&
+                    nullableSerializer.ValueSerializer is var nullableSerializerValueSerializer &&
+                    nullableSerializerValueSerializer.ValueType == node.Type)
+                {
+                    AddKnownSerializer(node, nullableSerializerValueSerializer);
+                }
+                else
+                {
+                    DeduceUnknowableSerializer(node);
+                }
             }
         }
 
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/KnownSerializerFinders/KnownSerializerFinderVisitNew.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/KnownSerializerFinders/KnownSerializerFinderVisitNew.cs
@@ -36,7 +36,8 @@ protected override Expression VisitNew(NewExpression node)
         if (IsKnown(node, out var nodeSerializer) &&
             arguments.Any(IsNotKnown))
         {
-            if (nodeSerializer is IBsonDocumentSerializer)
+            if (!typeof(BsonValue).IsAssignableFrom(node.Type) &&
+                nodeSerializer is IBsonDocumentSerializer)
             {
                 var matchingMemberSerializationInfos = nodeSerializer.GetMatchingMemberSerializationInfosForConstructorParameters(node, node.Constructor);
                 for (var i = 0; i < matchingMemberSerializationInfos.Count; i++)
@@ -70,7 +71,7 @@ IBsonSerializer GetKnownSerializer(ConstructorInfo constructor)
         {
             if (constructor == null)
             {
-                return null;
+                return CreateNewExpressionSerializer(node, node, bindings: null);
             }
             else if (constructor.DeclaringType == typeof(BsonDocument))
             {
@@ -91,7 +92,7 @@ IBsonSerializer GetKnownSerializer(ConstructorInfo constructor)
                     itemSerializer is IKeyValuePairSerializer keyValuePairSerializer)
                 {
                     var keySerializer = keyValuePairSerializer.KeySerializer;
-                    var valueSerializer =  keyValuePairSerializer.ValueSerializer;
+                    var valueSerializer = keyValuePairSerializer.ValueSerializer;
                     return DictionarySerializer.Create(keySerializer, valueSerializer);
                 }
             }
@@ -123,7 +124,7 @@ IBsonSerializer GetKnownSerializer(ConstructorInfo constructor)
             }
             else if (TupleOrValueTupleConstructor.IsTupleOrValueTupleConstructor(constructor))
             {
-                if (AllAreKnown(arguments,out var argumentSerializers))
+                if (AllAreKnown(arguments, out var argumentSerializers))
                 {
                     return TupleOrValueTupleSerializer.Create(constructor.DeclaringType, argumentSerializers);
                 }
diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp5532Tests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp5532Tests.cs
@@ -105,7 +105,7 @@ public void Projection_should_translate_correctly()
                                                                                 {
                                                                                     input : "$$p.Refs",
                                                                                     as : "j",
-                                                                                    in : { $in : ["$$j._id", ["222222222222222222222222"]] }
+                                                                                    in : { $in : ["$$j._id", [{ "$oid" : "222222222222222222222222" }]] }
                                                                                 }
                                                                             }
                                                                         }
@@ -119,7 +119,7 @@ public void Projection_should_translate_correctly()
                                                 }
                                             },
                                             as : "j",
-                                            cond : { $in : ['$$j._id', ["222222222222222222222222"]] }
+                                            cond : { $in : ['$$j._id', [{ "$oid" : "222222222222222222222222" }]] }
                                         }
                                     },
                                     0

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ protected override Expression VisitNew(NewExpression node)`
`36`	`36`	`if (IsKnown(node, out var nodeSerializer) &&`
`37`	`37`	`arguments.Any(IsNotKnown))`
`38`	`38`	`{`
`39`		`- if (nodeSerializer is IBsonDocumentSerializer)`
	`39`	`+ if (!typeof(BsonValue).IsAssignableFrom(node.Type) &&`
	`40`	`+ nodeSerializer is IBsonDocumentSerializer)`
`40`	`41`	`{`
`41`	`42`	`var matchingMemberSerializationInfos = nodeSerializer.GetMatchingMemberSerializationInfosForConstructorParameters(node, node.Constructor);`
`42`	`43`	`for (var i = 0; i < matchingMemberSerializationInfos.Count; i++)`
`@@ -70,7 +71,7 @@ IBsonSerializer GetKnownSerializer(ConstructorInfo constructor)`
`70`	`71`	`{`
`71`	`72`	`if (constructor == null)`
`72`	`73`	`{`
`73`		`- return null;`
	`74`	`+ return CreateNewExpressionSerializer(node, node, bindings: null);`
`74`	`75`	`}`
`75`	`76`	`else if (constructor.DeclaringType == typeof(BsonDocument))`
`76`	`77`	`{`
`@@ -91,7 +92,7 @@ IBsonSerializer GetKnownSerializer(ConstructorInfo constructor)`
`91`	`92`	`itemSerializer is IKeyValuePairSerializer keyValuePairSerializer)`
`92`	`93`	`{`
`93`	`94`	`var keySerializer = keyValuePairSerializer.KeySerializer;`
`94`		`- var valueSerializer = keyValuePairSerializer.ValueSerializer;`
	`95`	`+ var valueSerializer = keyValuePairSerializer.ValueSerializer;`
`95`	`96`	`return DictionarySerializer.Create(keySerializer, valueSerializer);`
`96`	`97`	`}`
`97`	`98`	`}`
`@@ -123,7 +124,7 @@ IBsonSerializer GetKnownSerializer(ConstructorInfo constructor)`
`123`	`124`	`}`
`124`	`125`	`else if (TupleOrValueTupleConstructor.IsTupleOrValueTupleConstructor(constructor))`
`125`	`126`	`{`
`126`		`- if (AllAreKnown(arguments,out var argumentSerializers))`
	`127`	`+ if (AllAreKnown(arguments, out var argumentSerializers))`
`127`	`128`	`{`
`128`	`129`	`return TupleOrValueTupleSerializer.Create(constructor.DeclaringType, argumentSerializers);`
`129`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public void Projection_should_translate_correctly()`
`105`	`105`	`{`
`106`	`106`	`input : "$$p.Refs",`
`107`	`107`	`as : "j",`
`108`		`- in : { $in : ["$$j._id", ["222222222222222222222222"]] }`
	`108`	`+ in : { $in : ["$$j._id", [{ "$oid" : "222222222222222222222222" }]] }`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`}`
`@@ -119,7 +119,7 @@ public void Projection_should_translate_correctly()`
`119`	`119`	`}`
`120`	`120`	`},`
`121`	`121`	`as : "j",`
`122`		`- cond : { $in : ['$$j._id', ["222222222222222222222222"]] }`
	`122`	`+ cond : { $in : ['$$j._id', [{ "$oid" : "222222222222222222222222" }]] }`
`123`	`123`	`}`
`124`	`124`	`},`
`125`	`125`	`0`