Skip to content

EF-317: Upgrade C# driver to 3.10.0 #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
damieng wants to merge 1 commit into
base: main
Choose a base branch
from
Open

EF-317: Upgrade C# driver to 3.10.0 #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<EF9Version>9.0.16</EF9Version>
<EF10Version>10.0.8</EF10Version>
<!-- DRIVER_VERSION env variable could be set by the CI to test EF Provider compatibility with different (newer) versions of the MongoDB.Driver -->
<CSharpDriverVersion Condition="'$(DRIVER_VERSION)' == ''">3.9.0</CSharpDriverVersion>
<CSharpDriverVersion Condition="'$(DRIVER_VERSION)' == ''">3.10.0</CSharpDriverVersion>
<CSharpDriverVersion Condition="'$(DRIVER_VERSION)' != ''">$(DRIVER_VERSION)</CSharpDriverVersion>
</PropertyGroup>
</Project>
146 changes: 32 additions & 114 deletions tests/MongoDB.EntityFrameworkCore.SpecificationTests/Query/NorthwindJoinQueryMongoTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,87 +148,43 @@ public override async Task Join_customers_orders_select(bool async)

public override async Task Join_customers_orders_with_subquery(bool async)
{
// Fails: Subquery selection EF-X001
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.Join_customers_orders_with_subquery(async))).Message);
await base.Join_customers_orders_with_subquery(async);

AssertMql(
"""
Customers.
Customers.{ "$project" : { "_outer" : "$$ROOT", "_id" : 0 } }, { "$lookup" : { "from" : "Orders", "localField" : "_outer._id", "foreignField" : "CustomerID", "pipeline" : [{ "$sort" : { "_id" : 1 } }], "as" : "_inner" } }, { "$unwind" : "$_inner" }, { "$project" : { "Outer" : "$_outer", "Inner" : "$_inner", "_id" : 0 } }, { "$match" : { "Inner.CustomerID" : "ALFKI" } }, { "$project" : { "ContactName" : "$Outer.ContactName", "OrderID" : "$Inner._id", "_id" : 0 } }
""");
}

[ConditionalTheory(Skip = "CSHARP-6017: driver 3.10 folds an uncorrelated Take/subquery join inner into the correlated $lookup sub-pipeline, returning wrong results")]
[MemberData(nameof(IsAsyncData))]
public override async Task Join_customers_orders_with_subquery_with_take(bool async)
{
// Fails: Subquery selection EF-X001
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.Join_customers_orders_with_subquery_with_take(async))).Message);

AssertMql(
"""
Customers.
""");
}
=> await base.Join_customers_orders_with_subquery_with_take(async);

[ConditionalTheory(Skip = "EF-352: shadow property read via EF.Property in a client-side join projection materialises as null")]
[MemberData(nameof(IsAsyncData))]
public override async Task Join_customers_orders_with_subquery_anonymous_property_method(bool async)
{
// Fails: Subquery selection EF-X001
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.Join_customers_orders_with_subquery_anonymous_property_method(async))).Message);

AssertMql(
"""
Customers.
""");
}
=> await base.Join_customers_orders_with_subquery_anonymous_property_method(async);

[ConditionalTheory(Skip = "CSHARP-6017: driver 3.10 folds an uncorrelated Take/subquery join inner into the correlated $lookup sub-pipeline, returning wrong results")]
[MemberData(nameof(IsAsyncData))]
public override async Task Join_customers_orders_with_subquery_anonymous_property_method_with_take(bool async)
{
// Fails: Subquery selection EF-X001
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.Join_customers_orders_with_subquery_anonymous_property_method_with_take(async))).Message);

AssertMql(
"""
Customers.
""");
}
=> await base.Join_customers_orders_with_subquery_anonymous_property_method_with_take(async);

public override async Task Join_customers_orders_with_subquery_predicate(bool async)
{
// Fails: Subquery selection EF-X001
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.Join_customers_orders_with_subquery_predicate(async))).Message);
await base.Join_customers_orders_with_subquery_predicate(async);

AssertMql(
"""
Customers.
Customers.{ "$project" : { "_outer" : "$$ROOT", "_id" : 0 } }, { "$lookup" : { "from" : "Orders", "localField" : "_outer._id", "foreignField" : "CustomerID", "pipeline" : [{ "$match" : { "_id" : { "$gt" : 0 } } }, { "$sort" : { "_id" : 1 } }], "as" : "_inner" } }, { "$unwind" : "$_inner" }, { "$project" : { "Outer" : "$_outer", "Inner" : "$_inner", "_id" : 0 } }, { "$match" : { "Inner.CustomerID" : "ALFKI" } }, { "$project" : { "ContactName" : "$Outer.ContactName", "OrderID" : "$Inner._id", "_id" : 0 } }
""");
}

[ConditionalTheory(Skip = "CSHARP-6017: driver 3.10 folds an uncorrelated Take/subquery join inner into the correlated $lookup sub-pipeline, returning wrong results")]
[MemberData(nameof(IsAsyncData))]
public override async Task Join_customers_orders_with_subquery_predicate_with_take(bool async)
{
// Fails: Subquery selection EF-X001
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.Join_customers_orders_with_subquery_predicate_with_take(async))).Message);

AssertMql(
"""
Customers.
""");
}
=> await base.Join_customers_orders_with_subquery_predicate_with_take(async);

public override async Task Join_composite_key(bool async)
{
Expand Down Expand Up @@ -316,19 +272,10 @@ public override async Task GroupJoin_simple_ordering(bool async)
""");
}

[ConditionalTheory(Skip = "CSHARP-6017: driver 3.10 folds an uncorrelated Take/subquery join inner into the correlated $lookup sub-pipeline, returning wrong results")]
[MemberData(nameof(IsAsyncData))]
public override async Task GroupJoin_simple_subquery(bool async)
{
// Fails: Subquery selection EF-X001
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.GroupJoin_simple_subquery(async))).Message);

AssertMql(
"""
Customers.
""");
}
=> await base.GroupJoin_simple_subquery(async);

public override async Task GroupJoin_as_final_operator(bool async)
{
Expand Down Expand Up @@ -402,14 +349,11 @@ public override async Task GroupJoin_DefaultIfEmpty2(bool async)
AssertMql(
);
#else
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.GroupJoin_DefaultIfEmpty2(async))).Message);
await base.GroupJoin_DefaultIfEmpty2(async);

AssertMql(
"""
Employees.
Employees.{ "$project" : { "_outer" : "$$ROOT", "_id" : 0 } }, { "$lookup" : { "from" : "Orders", "localField" : "_outer._id", "foreignField" : "EmployeeID", "pipeline" : [{ "$match" : { "CustomerID" : { "$regularExpression" : { "pattern" : "^F", "options" : "s" } } } }], "as" : "_inner" } }, { "$unwind" : "$_inner" }, { "$project" : { "_outer" : "$_outer", "_inner" : "$_inner", "_id" : 0 } }
""");
#endif
}
Expand Down Expand Up @@ -499,15 +443,11 @@ public override async Task GroupJoin_DefaultIfEmpty_Project(bool async)

public override async Task GroupJoin_SelectMany_subquery_with_filter(bool async)
{
// Fails: Subquery selection EF-X001
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.GroupJoin_SelectMany_subquery_with_filter(async))).Message);
await base.GroupJoin_SelectMany_subquery_with_filter(async);

AssertMql(
"""
Customers.
Customers.{ "$project" : { "_outer" : "$$ROOT", "_id" : 0 } }, { "$lookup" : { "from" : "Orders", "localField" : "_outer._id", "foreignField" : "CustomerID", "pipeline" : [{ "$match" : { "_id" : { "$gt" : 5 } } }], "as" : "_inner" } }, { "$unwind" : "$_inner" }, { "$project" : { "Outer" : "$_outer", "Inner" : "$_inner", "_id" : 0 } }, { "$project" : { "ContactName" : "$Outer.ContactName", "OrderID" : "$Inner._id", "_id" : 0 } }
""");
}

Expand All @@ -533,7 +473,7 @@ public override async Task GroupJoin_SelectMany_subquery_with_filter_and_Default

AssertMql(
"""
Customers.
Customers.{ "$match" : { "_id" : { "$regularExpression" : { "pattern" : "^F", "options" : "s" } } } }, { "$project" : { "_outer" : "$$ROOT", "_id" : 0 } }, { "$lookup" : { "from" : "Orders", "localField" : "_outer._id", "foreignField" : "CustomerID", "pipeline" : [{ "$match" : { "_id" : { "$gt" : 5 } } }], "as" : "_inner" } }, { "$unwind" : "$_inner" }, { "$project" : { "_outer" : "$_outer", "_inner" : "$_inner", "_id" : 0 } }
""");
#endif
}
Expand All @@ -546,19 +486,10 @@ public override async Task GroupJoin_SelectMany_subquery_with_filter_orderby_and
);
}

[ConditionalTheory(Skip = "CSHARP-6017: driver 3.10 folds an uncorrelated Take/subquery join inner into the correlated $lookup sub-pipeline, returning wrong results")]
[MemberData(nameof(IsAsyncData))]
public override async Task GroupJoin_Subquery_with_Take_Then_SelectMany_Where(bool async)
{
// Fails: Subquery selection EF-X001
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.GroupJoin_Subquery_with_Take_Then_SelectMany_Where(async))).Message);

AssertMql(
"""
Customers.
""");
}
=> await base.GroupJoin_Subquery_with_Take_Then_SelectMany_Where(async);

public override async Task Inner_join_with_tautology_predicate_converts_to_cross_join(bool async)
{
Expand Down Expand Up @@ -759,31 +690,18 @@ public override async Task GroupJoin_customers_employees_shadow(bool async)

public override async Task GroupJoin_customers_employees_subquery_shadow(bool async)
{
// Fails: Subquery selection EF-X001
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.GroupJoin_customers_employees_subquery_shadow(async))).Message);
await base.GroupJoin_customers_employees_subquery_shadow(async);

AssertMql(
"""
Customers.
Customers.{ "$project" : { "_outer" : "$$ROOT", "_id" : 0 } }, { "$lookup" : { "from" : "Employees", "localField" : "_outer.City", "foreignField" : "City", "pipeline" : [{ "$sort" : { "City" : 1 } }], "as" : "_inner" } }, { "$unwind" : "$_inner" }, { "$project" : { "Outer" : "$_outer", "Inner" : "$_inner", "_id" : 0 } }, { "$project" : { "Title" : "$Inner.Title", "_id" : "$Inner._id" } }
""");
}

[ConditionalTheory(Skip = "CSHARP-6017: driver 3.10 folds an uncorrelated Take/subquery join inner into the correlated $lookup sub-pipeline, returning wrong results")]
[MemberData(nameof(IsAsyncData))]
public override async Task GroupJoin_customers_employees_subquery_shadow_take(bool async)
{
// Fails: Subquery selection EF-X001
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.GroupJoin_customers_employees_subquery_shadow_take(async))).Message);

AssertMql(
"""
Customers.
""");
}
=> await base.GroupJoin_customers_employees_subquery_shadow_take(async);

public override async Task GroupJoin_projection(bool async)
{
Expand Down
31 changes: 8 additions & 23 deletions ...goDB.EntityFrameworkCore.SpecificationTests/Query/NorthwindMiscellaneousQueryMongoTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3412,10 +3412,7 @@ public override async Task Comparing_collection_navigation_to_null_complex(bool
AssertMql(
);
#else
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.Comparing_collection_navigation_to_null_complex(async))).Message);
await Assert.ThrowsAnyAsync<Exception>(() => base.Comparing_collection_navigation_to_null_complex(async));

AssertMql(
"""
Expand Down Expand Up @@ -3517,15 +3514,11 @@ public override async Task OrderBy_Dto_projection_skip_take(bool async)

public override async Task Join_take_count_works(bool async)
{
// Fails: Cross-document navigation access issue EF-216
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.Join_take_count_works(async))).Message);
await base.Join_take_count_works(async);

AssertMql(
"""
Orders.
Orders.{ "$match" : { "_id" : { "$gt" : 690, "$lt" : 710 } } }, { "$project" : { "_outer" : "$$ROOT", "_id" : 0 } }, { "$lookup" : { "from" : "Customers", "localField" : "_outer.CustomerID", "foreignField" : "_id", "pipeline" : [{ "$match" : { "_id" : "ALFKI" } }], "as" : "_inner" } }, { "$unwind" : "$_inner" }, { "$project" : { "Outer" : "$_outer", "Inner" : "$_inner", "_id" : 0 } }, { "$limit" : 5 }, { "$count" : "_v" }
""");
}

Expand Down Expand Up @@ -3793,16 +3786,12 @@ public override async Task Anonymous_projection_skip_take_empty_collection_First

public override async Task Checked_context_with_arithmetic_does_not_fail(bool async)
{
// Fails: checked issue EF-249
Assert.Contains(
"Expression not supported: (ConvertChecked",
(await Assert.ThrowsAsync<ExpressionNotSupportedException>(() =>
base.Checked_context_with_arithmetic_does_not_fail(async))).Message);
await base.Checked_context_with_arithmetic_does_not_fail(async);

AssertMql(
"""
OrderDetails.
""");
OrderDetails.{ "$match" : { "$and" : [{ "$expr" : { "$eq" : [{ "$add" : [{ "$toInt" : "$Quantity" }, 1] }, 5] } }, { "$expr" : { "$eq" : [{ "$subtract" : [{ "$toInt" : "$Quantity" }, 1] }, 3] } }, { "$expr" : { "$eq" : [{ "$multiply" : [{ "$toInt" : "$Quantity" }, 1] }, { "$toInt" : "$Quantity" }] } }] } }, { "$sort" : { "_id.OrderID" : 1 } }
""");
}

public override async Task Checked_context_with_case_to_same_nullable_type_does_not_fail(bool isAsync)
Expand Down Expand Up @@ -4174,15 +4163,11 @@ public override async Task Max_on_empty_sequence_throws(bool async)

public override async Task OrderBy_Join(bool async)
{
// Fails: Cross-document navigation access issue EF-216
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.OrderBy_Join(async))).Message);
await base.OrderBy_Join(async);

AssertMql(
"""
Customers.
Customers.{ "$sort" : { "_id" : 1 } }, { "$project" : { "_outer" : "$$ROOT", "_id" : 0 } }, { "$lookup" : { "from" : "Orders", "localField" : "_outer._id", "foreignField" : "CustomerID", "pipeline" : [{ "$sort" : { "_id" : 1 } }], "as" : "_inner" } }, { "$unwind" : "$_inner" }, { "$project" : { "Outer" : "$_outer", "Inner" : "$_inner", "_id" : 0 } }, { "$project" : { "CustomerID" : "$Outer._id", "OrderID" : "$Inner._id", "_id" : 0 } }
""");
}

Expand Down
7 changes: 2 additions & 5 deletions ...ongoDB.EntityFrameworkCore.SpecificationTests/Query/NorthwindNavigationsQueryMongoTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,11 @@ public override async Task Select_Where_Navigation_Deep(bool async)
AssertMql(
);
#else
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.Select_Where_Navigation_Deep(async))).Message);
await Assert.ThrowsAnyAsync<Exception>(() => base.Select_Where_Navigation_Deep(async));

AssertMql(
"""
OrderDetails.
OrderDetails.{ "$project" : { "_outer" : "$$ROOT", "_id" : 0 } }, { "$lookup" : { "from" : "Orders", "localField" : "_outer._id.OrderID", "foreignField" : "_id", "as" : "_inner" } }, { "$unwind" : "$_inner" }, { "$project" : { "Outer" : "$_outer", "Inner" : "$_inner", "_id" : 0 } }, { "$project" : { "_outer" : "$$ROOT", "_id" : 0 } }, { "$lookup" : { "from" : "Customers", "localField" : "_outer.Inner.CustomerID", "foreignField" : "_id", "as" : "_inner" } }, { "$unwind" : { "path" : "$_inner", "preserveNullAndEmptyArrays" : true } }, { "$project" : { "Outer" : "$_outer", "Inner" : "$_inner", "_id" : 0 } }, { "$match" : { "Inner.City" : "Seattle" } }, { "$sort" : { "Outer.Outer._id.OrderID" : 1, "Outer.Outer._id.ProductID" : 1 } }, { "$limit" : 1 }, { "$project" : { "_v" : "$Outer.Outer", "_id" : 0 } }
""");
#endif
}
Expand Down
15 changes: 6 additions & 9 deletions ...ngoDB.EntityFrameworkCore.SpecificationTests/Query/NorthwindQueryFiltersQueryMongoTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,11 @@ public override async Task Included_many_to_one_query(bool async)
AssertMql(
);
#else
await Assert.ThrowsAnyAsync<Exception>(() => base.Included_many_to_one_query(async));
await base.Included_many_to_one_query(async);

AssertMql(
"""
Orders.
Orders.{ "$project" : { "_outer" : "$$ROOT", "_id" : 0 } }, { "$lookup" : { "from" : "Customers", "localField" : "_outer.CustomerID", "foreignField" : "_id", "pipeline" : [{ "$match" : { "CompanyName" : { "$regularExpression" : { "pattern" : "^B", "options" : "s" } } } }], "as" : "_inner" } }, { "$unwind" : "$_inner" }, { "$project" : { "_outer" : "$_outer", "_inner" : "$_inner", "_id" : 0 } }, { "$match" : { "_inner" : { "$ne" : null }, "_inner.CompanyName" : { "$ne" : null } } }
""");
#endif
}
Expand Down Expand Up @@ -197,14 +197,11 @@ public override async Task Entity_Equality(bool async)
AssertMql(
);
#else
Assert.Contains(
"Expression not supported",
(await Assert.ThrowsAsync<MongoDB.Driver.Linq.ExpressionNotSupportedException>(() =>
base.Entity_Equality(async))).Message);
await base.Entity_Equality(async);

AssertMql(
"""
Orders.
Orders.{ "$project" : { "_outer" : "$$ROOT", "_id" : 0 } }, { "$lookup" : { "from" : "Customers", "localField" : "_outer.CustomerID", "foreignField" : "_id", "pipeline" : [{ "$match" : { "CompanyName" : { "$regularExpression" : { "pattern" : "^B", "options" : "s" } } } }], "as" : "_inner" } }, { "$unwind" : "$_inner" }, { "$project" : { "_outer" : "$_outer", "_inner" : "$_inner", "_id" : 0 } }, { "$match" : { "_inner" : { "$ne" : null }, "_inner.CompanyName" : { "$ne" : null } } }
""");
#endif
}
Expand All @@ -231,11 +228,11 @@ public override async Task Included_many_to_one_query2(bool async)
AssertMql(
);
#else
await Assert.ThrowsAnyAsync<Exception>(() => base.Included_many_to_one_query2(async));
await base.Included_many_to_one_query2(async);

AssertMql(
"""
Orders.
Orders.{ "$project" : { "_outer" : "$$ROOT", "_id" : 0 } }, { "$lookup" : { "from" : "Customers", "localField" : "_outer.CustomerID", "foreignField" : "_id", "pipeline" : [{ "$match" : { "CompanyName" : { "$regularExpression" : { "pattern" : "^B", "options" : "s" } } } }], "as" : "_inner" } }, { "$unwind" : "$_inner" }, { "$project" : { "_outer" : "$_outer", "_inner" : "$_inner", "_id" : 0 } }, { "$match" : { "_inner" : { "$ne" : null }, "_inner.CompanyName" : { "$ne" : null } } }
""");
#endif
}
Expand Down
Loading