Skip to content

Don't throw when attempting to load from a newly Added entity with unknown FK values #32343

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 20, 2023
Merged

Don't throw when attempting to load from a newly Added entity with unknown FK values #32343

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/Internal/EntityFinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ IQueryable IEntityFinder.Query(INavigation navigation, InternalEntityEntry entry
for (var i = 0; i < values.Length; i++)
{
var property = properties[i];
if (property.IsShadowProperty() && (detached || entry.IsUnknown(property)))
if (property.IsShadowProperty() && (detached || (entry.EntityState != EntityState.Added && entry.IsUnknown(property))))
{
throw new InvalidOperationException(
CoreStrings.CannotLoadDetachedShadow(navigation.Name, entry.EntityType.DisplayName()));
Expand Down
12 changes: 8 additions & 4 deletions test/EFCore.Specification.Tests/LazyLoadTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2006,7 +2006,8 @@ public virtual void Lazy_load_many_to_one_reference_to_principal_shadow_fk(

if (LazyLoadingEnabled)
{
if (state == EntityState.Detached && queryTrackingBehavior == QueryTrackingBehavior.TrackAll)
if (state == EntityState.Detached && queryTrackingBehavior == QueryTrackingBehavior.TrackAll
|| state == EntityState.Added && queryTrackingBehavior != QueryTrackingBehavior.TrackAll)
{
Assert.Null(child.Parent); // Explicitly detached
}
Expand Down Expand Up @@ -2094,7 +2095,8 @@ public virtual void Lazy_load_one_to_one_reference_to_principal_shadow_fk(

if (LazyLoadingEnabled)
{
if (state == EntityState.Detached && queryTrackingBehavior == QueryTrackingBehavior.TrackAll)
if (state == EntityState.Detached && queryTrackingBehavior == QueryTrackingBehavior.TrackAll
|| state == EntityState.Added && queryTrackingBehavior != QueryTrackingBehavior.TrackAll)
{
Assert.Null(single.Parent); // Explicitly detached
}
Expand Down Expand Up @@ -2258,7 +2260,8 @@ public virtual void Lazy_load_many_to_one_reference_to_principal_null_FK_shadow_
{
Assert.Null(child.Parent); // Explicitly detached
}
else if (queryTrackingBehavior != QueryTrackingBehavior.TrackAll)
else if (queryTrackingBehavior != QueryTrackingBehavior.TrackAll
&& state != EntityState.Added)
{
Assert.Equal(
CoreStrings.CannotLoadDetachedShadow("Parent", "ChildShadowFk"),
Expand Down Expand Up @@ -2327,7 +2330,8 @@ public virtual void Lazy_load_one_to_one_reference_to_principal_null_FK_shadow_f
{
Assert.Null(single.Parent);
}
else if (queryTrackingBehavior != QueryTrackingBehavior.TrackAll)
else if (queryTrackingBehavior != QueryTrackingBehavior.TrackAll
&& state != EntityState.Added)
{
Assert.Equal(
CoreStrings.CannotLoadDetachedShadow("Parent", "SingleShadowFk"),
Expand Down