Skip to content
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

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

Merged
merged 1 commit into from
Jan 4, 2023
Merged

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

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
3 changes: 2 additions & 1 deletion src/EFCore.Proxies/Proxies/Internal/ProxyBindingRewriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
{
Expand Down
23 changes: 23 additions & 0 deletions test/EFCore.Proxies.Tests/LazyLoadingProxyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down Expand Up @@ -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; }
Expand Down