Don't proxy navigations not configured for lazy loading (#29957)

dotnet · Jan 4, 2023 · ccd776c · ccd776c
1 parent b7e9a17
commit ccd776c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/EFCore.Proxies/Proxies/Internal/ProxyBindingRewriter.cs b/src/EFCore.Proxies/Proxies/Internal/ProxyBindingRewriter.cs
@@ -92,7 +92,8 @@ public virtual void ProcessModelFinalizing(
                                 ProxiesStrings.NonVirtualProperty(navigationBase.Name, entityType.DisplayName()));
                         }
 
-                        if (_options.UseLazyLoadingProxies)
+                        if (_options.UseLazyLoadingProxies
+                            && navigationBase.LazyLoadingEnabled)
                         {
                             if (!navigationBase.PropertyInfo.GetMethod!.IsReallyVirtual())
                             {

diff --git a/test/EFCore.Proxies.Tests/LazyLoadingProxyTests.cs b/test/EFCore.Proxies.Tests/LazyLoadingProxyTests.cs
@@ -36,6 +36,14 @@ public void Does_not_throw_if_non_virtual_navigation_to_non_owned_type_is_allowe
             context.Model.FindEntityType(typeof(LazyNonVirtualNavEntity))!.FindNavigation(nameof(LazyNonVirtualNavEntity.SelfRef)));
     }
 
+    [ConditionalFact]
+    public void Does_not_throw_if_non_virtual_navigation_is_set_to_not_eager_load()
+    {
+        using var context = new LazyContextDisabledNavigation();
+        Assert.NotNull(
+            context.Model.FindEntityType(typeof(LazyNonVirtualNavEntity))!.FindNavigation(nameof(LazyNonVirtualNavEntity.SelfRef)));
+    }
+
     [ConditionalFact]
     public void Does_not_throw_if_non_virtual_navigation_to_owned_type()
     {
@@ -108,6 +116,21 @@ public LazyContext()
         }
     }
 
+    private class LazyContextDisabledNavigation : TestContext<LazyNonVirtualNavEntity>
+    {
+        public LazyContextDisabledNavigation()
+            : base(dbName: "LazyLoadingContext", useLazyLoading: true, useChangeDetection: false)
+        {
+        }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+
+            modelBuilder.Entity<LazyNonVirtualNavEntity>().Navigation(e => e.SelfRef).EnableLazyLoading(false);
+        }
+    }
+
     public sealed class LazySealedEntity
     {
         public int Id { get; set; }