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

ajcvickers · ajcvickers · commit 11d03107dfae · 2023-11-20T19:48:57.000Z
diff --git a/src/EFCore/Internal/EntityFinder.cs b/src/EFCore/Internal/EntityFinder.cs
@@ -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()));
diff --git a/test/EFCore.Specification.Tests/LazyLoadTestBase.cs b/test/EFCore.Specification.Tests/LazyLoadTestBase.cs
@@ -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
             }
@@ -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
             }
@@ -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"),
@@ -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"),

Original file line number	Diff line number	Diff line change
`@@ -715,7 +715,7 @@ IQueryable IEntityFinder.Query(INavigation navigation, InternalEntityEntry entry`
`715`	`715`	`for (var i = 0; i < values.Length; i++)`
`716`	`716`	`{`
`717`	`717`	`var property = properties[i];`
`718`		`- if (property.IsShadowProperty() && (detached \|\| entry.IsUnknown(property)))`
	`718`	`+ if (property.IsShadowProperty() && (detached \|\| (entry.EntityState != EntityState.Added && entry.IsUnknown(property))))`
`719`	`719`	`{`
`720`	`720`	`throw new InvalidOperationException(`
`721`	`721`	`CoreStrings.CannotLoadDetachedShadow(navigation.Name, entry.EntityType.DisplayName()));`
Original file line number	Diff line number	Diff line change
`@@ -2006,7 +2006,8 @@ public virtual void Lazy_load_many_to_one_reference_to_principal_shadow_fk(`
`2006`	`2006`
`2007`	`2007`	`if (LazyLoadingEnabled)`
`2008`	`2008`	`{`
`2009`		`- if (state == EntityState.Detached && queryTrackingBehavior == QueryTrackingBehavior.TrackAll)`
	`2009`	`+ if (state == EntityState.Detached && queryTrackingBehavior == QueryTrackingBehavior.TrackAll`
	`2010`	`+ \|\| state == EntityState.Added && queryTrackingBehavior != QueryTrackingBehavior.TrackAll)`
`2010`	`2011`	`{`
`2011`	`2012`	`Assert.Null(child.Parent); // Explicitly detached`
`2012`	`2013`	`}`
`@@ -2094,7 +2095,8 @@ public virtual void Lazy_load_one_to_one_reference_to_principal_shadow_fk(`
`2094`	`2095`
`2095`	`2096`	`if (LazyLoadingEnabled)`
`2096`	`2097`	`{`
`2097`		`- if (state == EntityState.Detached && queryTrackingBehavior == QueryTrackingBehavior.TrackAll)`
	`2098`	`+ if (state == EntityState.Detached && queryTrackingBehavior == QueryTrackingBehavior.TrackAll`
	`2099`	`+ \|\| state == EntityState.Added && queryTrackingBehavior != QueryTrackingBehavior.TrackAll)`
`2098`	`2100`	`{`
`2099`	`2101`	`Assert.Null(single.Parent); // Explicitly detached`
`2100`	`2102`	`}`
`@@ -2258,7 +2260,8 @@ public virtual void Lazy_load_many_to_one_reference_to_principal_null_FK_shadow_`
`2258`	`2260`	`{`
`2259`	`2261`	`Assert.Null(child.Parent); // Explicitly detached`
`2260`	`2262`	`}`
`2261`		`- else if (queryTrackingBehavior != QueryTrackingBehavior.TrackAll)`
	`2263`	`+ else if (queryTrackingBehavior != QueryTrackingBehavior.TrackAll`
	`2264`	`+ && state != EntityState.Added)`
`2262`	`2265`	`{`
`2263`	`2266`	`Assert.Equal(`
`2264`	`2267`	`CoreStrings.CannotLoadDetachedShadow("Parent", "ChildShadowFk"),`
`@@ -2327,7 +2330,8 @@ public virtual void Lazy_load_one_to_one_reference_to_principal_null_FK_shadow_f`
`2327`	`2330`	`{`
`2328`	`2331`	`Assert.Null(single.Parent);`
`2329`	`2332`	`}`
`2330`		`- else if (queryTrackingBehavior != QueryTrackingBehavior.TrackAll)`
	`2333`	`+ else if (queryTrackingBehavior != QueryTrackingBehavior.TrackAll`
	`2334`	`+ && state != EntityState.Added)`
`2331`	`2335`	`{`
`2332`	`2336`	`Assert.Equal(`
`2333`	`2337`	`CoreStrings.CannotLoadDetachedShadow("Parent", "SingleShadowFk"),`