pr

sanych-sun · sanych-sun · commit d124020c58be · 2026-04-13T17:02:05.000-07:00
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Ast/Expressions/AstCreateObjectIdExpression.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Ast/Expressions/AstCreateObjectIdExpression.cs
@@ -22,16 +22,12 @@ internal sealed class AstCreateObjectIdExpression : AstExpression
 {
     public override AstNodeType NodeType => AstNodeType.CreateObjectIdExpression;
 
-    public override AstNode Accept(AstNodeVisitor visitor)
-    {
-        return visitor.VisitCreateObjectIdExpression(this);
-    }
+    public override AstNode Accept(AstNodeVisitor visitor) =>
+        visitor.VisitCreateObjectIdExpression(this);
 
-    public override BsonValue Render()
-    {
-        return new BsonDocument
+    public override BsonValue Render() =>
+        new BsonDocument
         {
             { "$createObjectId", new BsonDocument() }
         };
-    }
 }
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/CreateObjectIdMethodToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/CreateObjectIdMethodToAggregationExpressionTranslator.cs
@@ -18,22 +18,21 @@
 using MongoDB.Driver.Linq.Linq3Implementation.Misc;
 using MongoDB.Driver.Linq.Linq3Implementation.Reflection;
 
-namespace MongoDB.Driver.Linq.Linq3Implementation.Translators.ExpressionToAggregationExpressionTranslators.MethodTranslators
+namespace MongoDB.Driver.Linq.Linq3Implementation.Translators.ExpressionToAggregationExpressionTranslators.MethodTranslators;
+
+internal static class CreateObjectIdMethodToAggregationExpressionTranslator
 {
-    internal static class CreateObjectIdMethodToAggregationExpressionTranslator
+    public static TranslatedExpression Translate(TranslationContext context, MethodCallExpression expression)
     {
-        public static TranslatedExpression Translate(TranslationContext context, MethodCallExpression expression)
-        {
-            var method = expression.Method;
-
-            if (method.Is(MqlMethod.CreateObjectId))
-            {
-                var ast = AstExpression.CreateObjectId();
-                var serializer = context.GetSerializer(expression);
-                return new TranslatedExpression(expression, ast, serializer);
-            }
+        var method = expression.Method;
 
-            throw new ExpressionNotSupportedException(expression);
+        if (method.Is(MqlMethod.CreateObjectId))
+        {
+            var ast = AstExpression.CreateObjectId();
+            var serializer = context.GetSerializer(expression);
+            return new TranslatedExpression(expression, ast, serializer);
         }
+
+        throw new ExpressionNotSupportedException(expression);
     }
 }
diff --git a/tests/MongoDB.Driver.Tests/Linq/Integration/MqlCreateObjectIdTests.cs b/tests/MongoDB.Driver.Tests/Linq/Integration/MqlCreateObjectIdTests.cs
@@ -32,7 +32,7 @@ public MqlCreateObjectIdTests(ClassFixture fixture)
     }
 
     [Fact]
-    public void MqlCreateObjectId_in_where()
+    public void MqlCreateObjectId_in_where_should_work()
     {
         var collection = Fixture.Collection;
         var queryable = collection.AsQueryable()
@@ -46,7 +46,7 @@ public void MqlCreateObjectId_in_where()
     }
 
     [Fact]
-    public void MqlCreateObjectId_in_select()
+    public void MqlCreateObjectId_in_select_should_work()
     {
         var collection = Fixture.Collection;
         var queryable = collection.AsQueryable()
@@ -65,7 +65,7 @@ public void MqlCreateObjectId_in_select()
     }
 
     [Fact]
-    public async Task MqlCreateObjectId_in_filter_builder()
+    public async Task MqlCreateObjectId_in_filter_builder_should_work()
     {
         var collection = Fixture.Collection;
 
@@ -78,7 +78,7 @@ public async Task MqlCreateObjectId_in_filter_builder()
     }
 
     [Fact]
-    public async Task MqlCreateObjectId_in_projection_builder()
+    public async Task MqlCreateObjectId_in_projection_builder_should_work()
     {
         var collection = Fixture.Collection;
 
@@ -97,7 +97,7 @@ public async Task MqlCreateObjectId_in_projection_builder()
     }
 
     [Fact]
-    public async Task MqlCreateObjectId_in_aggregate()
+    public async Task MqlCreateObjectId_in_aggregate_should_work()
     {
         var collection = Fixture.Collection;
 
diff --git a/tests/MongoDB.Driver.Tests/Linq/Integration/MqlSubtypeTests.cs b/tests/MongoDB.Driver.Tests/Linq/Integration/MqlSubtypeTests.cs
@@ -38,7 +38,7 @@ public MqlSubtypeTests(ClassFixture fixture)
     [InlineData(BsonBinarySubType.Vector, 2)]
     [InlineData(BsonBinarySubType.UuidStandard, 3)]
     [InlineData(null, 4)]
-    public void MqlSubtype_in_where(BsonBinarySubType? subtype, int expectedId)
+    public void MqlSubtype_in_where_should_work(BsonBinarySubType? subtype, int expectedId)
     {
         var collection = Fixture.Collection;
         var queryable = collection.AsQueryable()
@@ -52,7 +52,7 @@ public void MqlSubtype_in_where(BsonBinarySubType? subtype, int expectedId)
     }
 
     [Fact]
-    public void MqlSubtype_in_select()
+    public void MqlSubtype_in_select_should_work()
     {
         var collection = Fixture.Collection;
         var queryable = collection.AsQueryable()
@@ -66,7 +66,7 @@ public void MqlSubtype_in_select()
     }
 
     [Fact]
-    public async Task MqlSubtype_in_filter_builder()
+    public async Task MqlSubtype_in_filter_builder_should_work()
     {
         var collection = Fixture.Collection;
 
@@ -79,7 +79,7 @@ public async Task MqlSubtype_in_filter_builder()
     }
 
     [Fact]
-    public async Task MqlSubtype_in_projection_builder()
+    public async Task MqlSubtype_in_projection_builder_should_work()
     {
         var collection = Fixture.Collection;
 
@@ -93,7 +93,7 @@ public async Task MqlSubtype_in_projection_builder()
     }
 
     [Fact]
-    public async Task MqlSubtype_in_aggregate()
+    public async Task MqlSubtype_in_aggregate_should_work()
     {
         var collection = Fixture.Collection;
 
diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/SerializerFinders/MqlCreateObjectIdTests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/SerializerFinders/MqlCreateObjectIdTests.cs
diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/SerializerFinders/MqlTests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/SerializerFinders/MqlTests.cs
@@ -51,6 +51,7 @@ public void SerializerFinder_should_resolve_mql_methods(LambdaExpression express
         [TestHelpers.MakeLambda((MyModel model) => Mql.SimilarityDotProduct(model.Vector1, model.Vector2, false)), typeof(DoubleSerializer)],
         [TestHelpers.MakeLambda((MyModel model) => Mql.SimilarityEuclidean(model.Vector1, model.Vector2, false)), typeof(DoubleSerializer)],
         [TestHelpers.MakeLambda((MyModel model) => Mql.Subtype(model.Data)), typeof(NullableSerializer<BsonBinarySubType>)],
+        [TestHelpers.MakeLambda((MyModel model) => Mql.CreateObjectId()), typeof(ObjectIdSerializer)],
     ];
 
     private class MyModel

Original file line number	Diff line number	Diff line change
`@@ -22,16 +22,12 @@ internal sealed class AstCreateObjectIdExpression : AstExpression`
`22`	`22`	`{`
`23`	`23`	`public override AstNodeType NodeType => AstNodeType.CreateObjectIdExpression;`
`24`	`24`
`25`		`- public override AstNode Accept(AstNodeVisitor visitor)`
`26`		`- {`
`27`		`- return visitor.VisitCreateObjectIdExpression(this);`
`28`		`- }`
	`25`	`+ public override AstNode Accept(AstNodeVisitor visitor) =>`
	`26`	`+ visitor.VisitCreateObjectIdExpression(this);`
`29`	`27`
`30`		`- public override BsonValue Render()`
`31`		`- {`
`32`		`- return new BsonDocument`
	`28`	`+ public override BsonValue Render() =>`
	`29`	`+ new BsonDocument`
`33`	`30`	`{`
`34`	`31`	`{ "$createObjectId", new BsonDocument() }`
`35`	`32`	`};`
`36`		`- }`
`37`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public MqlCreateObjectIdTests(ClassFixture fixture)`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`[Fact]`
`35`		`- public void MqlCreateObjectId_in_where()`
	`35`	`+ public void MqlCreateObjectId_in_where_should_work()`
`36`	`36`	`{`
`37`	`37`	`var collection = Fixture.Collection;`
`38`	`38`	`var queryable = collection.AsQueryable()`
`@@ -46,7 +46,7 @@ public void MqlCreateObjectId_in_where()`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`[Fact]`
`49`		`- public void MqlCreateObjectId_in_select()`
	`49`	`+ public void MqlCreateObjectId_in_select_should_work()`
`50`	`50`	`{`
`51`	`51`	`var collection = Fixture.Collection;`
`52`	`52`	`var queryable = collection.AsQueryable()`
`@@ -65,7 +65,7 @@ public void MqlCreateObjectId_in_select()`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`[Fact]`
`68`		`- public async Task MqlCreateObjectId_in_filter_builder()`
	`68`	`+ public async Task MqlCreateObjectId_in_filter_builder_should_work()`
`69`	`69`	`{`
`70`	`70`	`var collection = Fixture.Collection;`
`71`	`71`
`@@ -78,7 +78,7 @@ public async Task MqlCreateObjectId_in_filter_builder()`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`[Fact]`
`81`		`- public async Task MqlCreateObjectId_in_projection_builder()`
	`81`	`+ public async Task MqlCreateObjectId_in_projection_builder_should_work()`
`82`	`82`	`{`
`83`	`83`	`var collection = Fixture.Collection;`
`84`	`84`
`@@ -97,7 +97,7 @@ public async Task MqlCreateObjectId_in_projection_builder()`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`[Fact]`
`100`		`- public async Task MqlCreateObjectId_in_aggregate()`
	`100`	`+ public async Task MqlCreateObjectId_in_aggregate_should_work()`
`101`	`101`	`{`
`102`	`102`	`var collection = Fixture.Collection;`
`103`	`103`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public MqlSubtypeTests(ClassFixture fixture)`
`38`	`38`	`[InlineData(BsonBinarySubType.Vector, 2)]`
`39`	`39`	`[InlineData(BsonBinarySubType.UuidStandard, 3)]`
`40`	`40`	`[InlineData(null, 4)]`
`41`		`- public void MqlSubtype_in_where(BsonBinarySubType? subtype, int expectedId)`
	`41`	`+ public void MqlSubtype_in_where_should_work(BsonBinarySubType? subtype, int expectedId)`
`42`	`42`	`{`
`43`	`43`	`var collection = Fixture.Collection;`
`44`	`44`	`var queryable = collection.AsQueryable()`
`@@ -52,7 +52,7 @@ public void MqlSubtype_in_where(BsonBinarySubType? subtype, int expectedId)`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`[Fact]`
`55`		`- public void MqlSubtype_in_select()`
	`55`	`+ public void MqlSubtype_in_select_should_work()`
`56`	`56`	`{`
`57`	`57`	`var collection = Fixture.Collection;`
`58`	`58`	`var queryable = collection.AsQueryable()`
`@@ -66,7 +66,7 @@ public void MqlSubtype_in_select()`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`[Fact]`
`69`		`- public async Task MqlSubtype_in_filter_builder()`
	`69`	`+ public async Task MqlSubtype_in_filter_builder_should_work()`
`70`	`70`	`{`
`71`	`71`	`var collection = Fixture.Collection;`
`72`	`72`
`@@ -79,7 +79,7 @@ public async Task MqlSubtype_in_filter_builder()`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`[Fact]`
`82`		`- public async Task MqlSubtype_in_projection_builder()`
	`82`	`+ public async Task MqlSubtype_in_projection_builder_should_work()`
`83`	`83`	`{`
`84`	`84`	`var collection = Fixture.Collection;`
`85`	`85`
`@@ -93,7 +93,7 @@ public async Task MqlSubtype_in_projection_builder()`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`[Fact]`
`96`		`- public async Task MqlSubtype_in_aggregate()`
	`96`	`+ public async Task MqlSubtype_in_aggregate_should_work()`
`97`	`97`	`{`
`98`	`98`	`var collection = Fixture.Collection;`
`99`	`99`