Skip to content

Commit 24e46fc

Browse files
rojiCopilot
andcommitted
Address review feedback: use var, explicit key values, proper Cosmos override
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent e35557e commit 24e46fc

3 files changed

Lines changed: 15 additions & 6 deletions

File tree

src/EFCore.Relational/Query/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1479,7 +1479,7 @@ Expression CompensateForCollectionMaterialization(ParameterExpression parameter,
14791479
{
14801480
if (_containsCollectionMaterialization)
14811481
{
1482-
Expression expressionToAdd = parameter;
1482+
var expressionToAdd = (Expression)parameter;
14831483
if (expressionToAdd.Type.IsValueType)
14841484
{
14851485
expressionToAdd = Convert(expressionToAdd, typeof(object));

test/EFCore.Cosmos.FunctionalTests/Query/Associations/ComplexProperties/ComplexPropertiesCollectionCosmosTest.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,12 @@ FROM root c
221221
}
222222

223223

224-
// Cosmos doesn't support entity collection navigations across documents.
225-
public override Task Project_struct_complex_type_with_entity_collection_navigation()
226-
=> Task.CompletedTask;
224+
public override async Task Project_struct_complex_type_with_entity_collection_navigation()
225+
{
226+
await base.Project_struct_complex_type_with_entity_collection_navigation();
227+
228+
AssertSql();
229+
}
227230

228231
[ConditionalFact]
229232
public virtual void Check_all_tests_overridden()

test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesCollectionTestBase.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ public virtual async Task Project_struct_complex_type_with_entity_collection_nav
1717
{
1818
context.Add(new Context37926.Parent
1919
{
20+
Id = 1,
2021
Coords = new Context37926.Coords { X = 1, Y = 2 },
21-
Children = [new() { Name = "Child1" }]
22+
Children = [new() { Id = 1, Name = "Child1" }]
2223
});
2324
await context.SaveChangesAsync();
2425
});
@@ -37,12 +38,17 @@ public virtual async Task Project_struct_complex_type_with_entity_collection_nav
3738
protected class Context37926(DbContextOptions options) : DbContext(options)
3839
{
3940
protected override void OnModelCreating(ModelBuilder modelBuilder)
40-
=> modelBuilder.Entity<Parent>(b =>
41+
{
42+
modelBuilder.Entity<Parent>(b =>
4143
{
44+
b.Property(e => e.Id).ValueGeneratedNever();
4245
b.ComplexProperty(e => e.Coords);
4346
b.HasMany(e => e.Children).WithOne().HasForeignKey(c => c.ParentId);
4447
});
4548

49+
modelBuilder.Entity<Child>().Property(e => e.Id).ValueGeneratedNever();
50+
}
51+
4652
public class Parent
4753
{
4854
public int Id { get; set; }

0 commit comments

Comments
 (0)