Skip to content

[release/10.0] Fix parameter type for ComplexCollection method #37065

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

Merged
merged 1 commit into from
Nov 4, 2025
+10 −3
Merged

[release/10.0] Fix parameter type for ComplexCollection method #37065

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 src/EFCore/ChangeTracking/ComplexElementEntry`.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public virtual ComplexPropertyEntry<TEntity, TNestedComplexProperty> ComplexProp
/// </param>
/// <returns>An object that exposes change tracking information and operations for the given property.</returns>
public virtual ComplexCollectionEntry<TEntity, TElement> ComplexCollection<TElement>(
Expression<Func<TEntity, IEnumerable<TElement>?>> propertyExpression)
Expression<Func<TComplexProperty, IEnumerable<TElement>?>> propertyExpression)
where TElement : notnull
{
Check.NotNull(propertyExpression, nameof(propertyExpression));
Expand Down
2 changes: 1 addition & 1 deletion src/EFCore/ChangeTracking/ComplexPropertyEntry`.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public virtual ComplexPropertyEntry<TEntity, TNestedComplexProperty> ComplexProp
/// </param>
/// <returns>An object that exposes change tracking information and operations for the given property.</returns>
public virtual ComplexCollectionEntry<TEntity, TElement> ComplexCollection<TElement>(
Expression<Func<TEntity, IEnumerable<TElement>?>> propertyExpression)
Expression<Func<TComplexProperty, IEnumerable<TElement>?>> propertyExpression)
where TElement : notnull
{
Check.NotNull(propertyExpression, nameof(propertyExpression));
Expand Down
9 changes: 8 additions & 1 deletion test/EFCore.Tests/ChangeTracking/Internal/InternalComplexEntryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ public void DetectChanges_detects_changes_in_nested_complex_collections()
{
Items =
[
new NestedItem { Name = "bar" },
new NestedItem { Name = "bar1" },
new NestedItem { Name = "baz" },
new NestedItem { Name = "new-bar" }
]
Expand All @@ -717,6 +717,13 @@ public void DetectChanges_detects_changes_in_nested_complex_collections()
changeDetector.DetectChanges(stateManager);

Assert.Equal(EntityState.Modified, entityEntry.EntityState);

var nestedJson = new EntityEntry<BlogWithNested>(entityEntry).ComplexProperty(b => b.NestedJson);
var items = nestedJson.ComplexCollection(j => j.Items);
Assert.Equal(3, items.CurrentValue!.Count);
Assert.Equal(EntityState.Modified, items[0].State);
Assert.Equal(EntityState.Unchanged, items[1].State);
Assert.Equal(EntityState.Added, items[2].State);
}

private static IModel CreateModel()
Expand Down