diff --git a/src/EFCore/Extensions/EntityFrameworkQueryableExtensions.cs b/src/EFCore/Extensions/EntityFrameworkQueryableExtensions.cs
index e3b92d4b004..4aaa204a249 100644
--- a/src/EFCore/Extensions/EntityFrameworkQueryableExtensions.cs
+++ b/src/EFCore/Extensions/EntityFrameworkQueryableExtensions.cs
@@ -2655,11 +2655,11 @@ source.Provider is EntityQueryProvider
#endregion
- #region Eager loaded navigations
+ #region Auto included navigations
- internal static readonly MethodInfo IgnoreEagerLoadedNavigationsMethodInfo
+ internal static readonly MethodInfo IgnoreAutoIncludesMethodInfo
= typeof(EntityFrameworkQueryableExtensions)
- .GetTypeInfo().GetDeclaredMethod(nameof(IgnoreEagerLoadedNavigations));
+ .GetTypeInfo().GetDeclaredMethod(nameof(IgnoreAutoIncludes));
///
/// Specifies that the current Entity Framework LINQ query should not have any
@@ -2670,7 +2670,7 @@ internal static readonly MethodInfo IgnoreEagerLoadedNavigationsMethodInfo
///
/// A new query that will not apply any model-level eager loaded navigations.
///
- public static IQueryable IgnoreEagerLoadedNavigations(
+ public static IQueryable IgnoreAutoIncludes(
[NotNull] this IQueryable source)
where TEntity : class
{
@@ -2681,7 +2681,7 @@ source.Provider is EntityQueryProvider
? source.Provider.CreateQuery(
Expression.Call(
instance: null,
- method: IgnoreEagerLoadedNavigationsMethodInfo.MakeGenericMethod(typeof(TEntity)),
+ method: IgnoreAutoIncludesMethodInfo.MakeGenericMethod(typeof(TEntity)),
arguments: source.Expression))
: source;
}
diff --git a/src/EFCore/Metadata/Builders/IConventionNavigationBuilder.cs b/src/EFCore/Metadata/Builders/IConventionNavigationBuilder.cs
index 75efac4382c..39db36bf639 100644
--- a/src/EFCore/Metadata/Builders/IConventionNavigationBuilder.cs
+++ b/src/EFCore/Metadata/Builders/IConventionNavigationBuilder.cs
@@ -83,23 +83,23 @@ public interface IConventionNavigationBuilder : IConventionAnnotatableBuilder
IConventionNavigationBuilder UsePropertyAccessMode(PropertyAccessMode? propertyAccessMode, bool fromDataAnnotation = false);
///
- /// Returns a value indicating whether this navigation can be configured to be eager loaded in a query
+ /// Returns a value indicating whether this navigation can be configured to be automatically included in a query
/// from the current configuration source.
///
- /// A value indicating whether the navigation should be eager loaded.
+ /// A value indicating whether the navigation should be automatically included.
/// Indicates whether the configuration was specified using a data annotation.
- /// if eager loaded can be set for this navigation.
- bool CanSetIsEagerLoaded(bool? eagerLoaded, bool fromDataAnnotation = false);
+ /// if automatically included can be set for this navigation.
+ bool CanSetAutoInclude(bool? autoInclude, bool fromDataAnnotation = false);
///
- /// Configures this navigation to be eager loaded in a query
+ /// Configures this navigation to be automatically included in a query.
///
- /// A value indicating whether the navigation should be eager loaded.
+ /// A value indicating whether the navigation should be automatically included.
/// Indicates whether the configuration was specified using a data annotation.
///
/// The same builder instance if the configuration was applied,
/// otherwise.
///
- IConventionNavigationBuilder IsEagerLoaded(bool? eagerLoaded, bool fromDataAnnotation = false);
+ IConventionNavigationBuilder AutoInclude(bool? autoInclude, bool fromDataAnnotation = false);
}
}
diff --git a/src/EFCore/Metadata/Builders/IConventionSkipNavigationBuilder.cs b/src/EFCore/Metadata/Builders/IConventionSkipNavigationBuilder.cs
index 25a90a11ef6..03b220e78c9 100644
--- a/src/EFCore/Metadata/Builders/IConventionSkipNavigationBuilder.cs
+++ b/src/EFCore/Metadata/Builders/IConventionSkipNavigationBuilder.cs
@@ -131,23 +131,23 @@ public interface IConventionSkipNavigationBuilder : IConventionAnnotatableBuilde
bool CanSetInverse([CanBeNull] IConventionSkipNavigation inverse, bool fromDataAnnotation = false);
///
- /// Returns a value indicating whether this navigation can be configured to be eager loaded in a query
+ /// Returns a value indicating whether this navigation can be configured to be automatically included in a query
/// from the current configuration source.
///
- /// A value indicating whether the navigation should be eager loaded.
+ /// A value indicating whether the navigation should be automatically included.
/// Indicates whether the configuration was specified using a data annotation.
- /// if eager loaded can be set for this navigation.
- bool CanSetIsEagerLoaded(bool? eagerLoaded, bool fromDataAnnotation = false);
+ /// if automatically included can be set for this navigation.
+ bool CanSetAutoInclude(bool? autoInclude, bool fromDataAnnotation = false);
///
- /// Configures this navigation to be eager loaded in a query
+ /// Configures this navigation to be automatically included in a query.
///
- /// A value indicating whether the navigation should be eager loaded.
+ /// A value indicating whether the navigation should be automatically included.
/// Indicates whether the configuration was specified using a data annotation.
///
/// The same builder instance if the configuration was applied,
/// otherwise.
///
- IConventionSkipNavigationBuilder IsEagerLoaded(bool? eagerLoaded, bool fromDataAnnotation = false);
+ IConventionSkipNavigationBuilder AutoInclude(bool? autoInclude, bool fromDataAnnotation = false);
}
}
diff --git a/src/EFCore/Metadata/Builders/NavigationBuilder.cs b/src/EFCore/Metadata/Builders/NavigationBuilder.cs
index c15ac298b5b..2a4e728d3a1 100644
--- a/src/EFCore/Metadata/Builders/NavigationBuilder.cs
+++ b/src/EFCore/Metadata/Builders/NavigationBuilder.cs
@@ -123,19 +123,19 @@ public virtual NavigationBuilder HasField([CanBeNull] string fieldName)
}
///
- /// Configures whether this navigation should be eager loaded in a query.
+ /// Configures whether this navigation should be automatically included in a query.
///
- /// A value indicating if the navigation should be eager loaded.
+ /// A value indicating if the navigation should be automatically included.
/// The same builder instance so that multiple configuration calls can be chained.
- public virtual NavigationBuilder IsEagerLoaded(bool eagerLoaded = true)
+ public virtual NavigationBuilder AutoInclude(bool autoInclude = true)
{
if (InternalNavigationBuilder != null)
{
- InternalNavigationBuilder.IsEagerLoaded(eagerLoaded, ConfigurationSource.Explicit);
+ InternalNavigationBuilder.AutoInclude(autoInclude, ConfigurationSource.Explicit);
}
else
{
- InternalSkipNavigationBuilder.IsEagerLoaded(eagerLoaded, ConfigurationSource.Explicit);
+ InternalSkipNavigationBuilder.AutoInclude(autoInclude, ConfigurationSource.Explicit);
}
return this;
diff --git a/src/EFCore/Metadata/Conventions/NavigationEagerLoadingConvention.cs b/src/EFCore/Metadata/Conventions/NavigationEagerLoadingConvention.cs
index 795241103b3..0b1ea7d489f 100644
--- a/src/EFCore/Metadata/Conventions/NavigationEagerLoadingConvention.cs
+++ b/src/EFCore/Metadata/Conventions/NavigationEagerLoadingConvention.cs
@@ -34,7 +34,7 @@ public NavigationEagerLoadingConvention([NotNull] ProviderConventionSetBuilderDe
public virtual void ProcessForeignKeyOwnershipChanged(
IConventionForeignKeyBuilder relationshipBuilder, IConventionContext context)
{
- relationshipBuilder.Metadata.PrincipalToDependent?.Builder.IsEagerLoaded(relationshipBuilder.Metadata.IsOwnership);
+ relationshipBuilder.Metadata.PrincipalToDependent?.Builder.AutoInclude(relationshipBuilder.Metadata.IsOwnership);
}
}
}
diff --git a/src/EFCore/Metadata/Internal/InternalNavigationBuilder.cs b/src/EFCore/Metadata/Internal/InternalNavigationBuilder.cs
index c19fd9faf8e..4212cd0493e 100644
--- a/src/EFCore/Metadata/Internal/InternalNavigationBuilder.cs
+++ b/src/EFCore/Metadata/Internal/InternalNavigationBuilder.cs
@@ -61,12 +61,12 @@ public InternalNavigationBuilder([NotNull] Navigation metadata, [NotNull] Intern
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
///
- public virtual bool CanSetIsEagerLoaded(bool? eagerLoaded, ConfigurationSource configurationSource)
+ public virtual bool CanSetAutoInclude(bool? autoInclude, ConfigurationSource configurationSource)
{
IConventionNavigation conventionNavigation = Metadata;
return configurationSource.Overrides(conventionNavigation.GetIsEagerLoadedConfigurationSource())
- || conventionNavigation.IsEagerLoaded == eagerLoaded;
+ || conventionNavigation.IsEagerLoaded == autoInclude;
}
///
@@ -75,11 +75,11 @@ public virtual bool CanSetIsEagerLoaded(bool? eagerLoaded, ConfigurationSource c
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
///
- public virtual InternalNavigationBuilder IsEagerLoaded(bool? eagerLoaded, ConfigurationSource configurationSource)
+ public virtual InternalNavigationBuilder AutoInclude(bool? autoInclude, ConfigurationSource configurationSource)
{
- if (CanSetIsEagerLoaded(eagerLoaded, configurationSource))
+ if (CanSetAutoInclude(autoInclude, configurationSource))
{
- Metadata.SetIsEagerLoaded(eagerLoaded, configurationSource);
+ Metadata.SetIsEagerLoaded(autoInclude, configurationSource);
return this;
}
@@ -136,12 +136,12 @@ IConventionNavigationBuilder IConventionNavigationBuilder.HasField(FieldInfo fie
///
[DebuggerStepThrough]
- bool IConventionNavigationBuilder.CanSetIsEagerLoaded(bool? eagerLoaded, bool fromDataAnnotation)
- => CanSetIsEagerLoaded(eagerLoaded, fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);
+ bool IConventionNavigationBuilder.CanSetAutoInclude(bool? autoInclude, bool fromDataAnnotation)
+ => CanSetAutoInclude(autoInclude, fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);
///
[DebuggerStepThrough]
- IConventionNavigationBuilder IConventionNavigationBuilder.IsEagerLoaded(bool? eagerLoaded, bool fromDataAnnotation)
- => IsEagerLoaded(eagerLoaded, fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);
+ IConventionNavigationBuilder IConventionNavigationBuilder.AutoInclude(bool? autoInclude, bool fromDataAnnotation)
+ => AutoInclude(autoInclude, fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);
}
}
diff --git a/src/EFCore/Metadata/Internal/InternalSkipNavigationBuilder.cs b/src/EFCore/Metadata/Internal/InternalSkipNavigationBuilder.cs
index 7b8ad1eee58..bb14f7c753f 100644
--- a/src/EFCore/Metadata/Internal/InternalSkipNavigationBuilder.cs
+++ b/src/EFCore/Metadata/Internal/InternalSkipNavigationBuilder.cs
@@ -287,12 +287,12 @@ public virtual InternalSkipNavigationBuilder Attach(
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
///
- public virtual bool CanSetIsEagerLoaded(bool? eagerLoaded, ConfigurationSource configurationSource)
+ public virtual bool CanSetAutoInclude(bool? autoInclude, ConfigurationSource configurationSource)
{
IConventionSkipNavigation conventionNavigation = Metadata;
return configurationSource.Overrides(conventionNavigation.GetIsEagerLoadedConfigurationSource())
- || conventionNavigation.IsEagerLoaded == eagerLoaded;
+ || conventionNavigation.IsEagerLoaded == autoInclude;
}
///
@@ -301,11 +301,11 @@ public virtual bool CanSetIsEagerLoaded(bool? eagerLoaded, ConfigurationSource c
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
///
- public virtual InternalSkipNavigationBuilder IsEagerLoaded(bool? eagerLoaded, ConfigurationSource configurationSource)
+ public virtual InternalSkipNavigationBuilder AutoInclude(bool? autoInclude, ConfigurationSource configurationSource)
{
- if (CanSetIsEagerLoaded(eagerLoaded, configurationSource))
+ if (CanSetAutoInclude(autoInclude, configurationSource))
{
- Metadata.SetIsEagerLoaded(eagerLoaded, configurationSource);
+ Metadata.SetIsEagerLoaded(autoInclude, configurationSource);
return this;
}
@@ -396,12 +396,12 @@ bool IConventionSkipNavigationBuilder.CanSetInverse(
///
[DebuggerStepThrough]
- bool IConventionSkipNavigationBuilder.CanSetIsEagerLoaded(bool? eagerLoaded, bool fromDataAnnotation)
- => CanSetIsEagerLoaded(eagerLoaded, fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);
+ bool IConventionSkipNavigationBuilder.CanSetAutoInclude(bool? autoInclude, bool fromDataAnnotation)
+ => CanSetAutoInclude(autoInclude, fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);
///
[DebuggerStepThrough]
- IConventionSkipNavigationBuilder IConventionSkipNavigationBuilder.IsEagerLoaded(bool? eagerLoaded, bool fromDataAnnotation)
- => IsEagerLoaded(eagerLoaded, fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);
+ IConventionSkipNavigationBuilder IConventionSkipNavigationBuilder.AutoInclude(bool? autoInclude, bool fromDataAnnotation)
+ => AutoInclude(autoInclude, fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);
}
}
diff --git a/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.cs b/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.cs
index 1b92540c7af..96b80ebea73 100644
--- a/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.cs
+++ b/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.cs
@@ -1694,7 +1694,7 @@ var outboundNavigations
.Concat(entityType.GetDerivedSkipNavigations())
.Where(n => n.IsEagerLoaded);
- if (_queryCompilationContext.IgnoreEagerLoadedNavigations)
+ if (_queryCompilationContext.IgnoreAutoIncludes)
{
outboundNavigations = outboundNavigations.Where(n => n is INavigation navigation && navigation.ForeignKey.IsOwnership);
}
diff --git a/src/EFCore/Query/Internal/QueryableMethodNormalizingExpressionVisitor.cs b/src/EFCore/Query/Internal/QueryableMethodNormalizingExpressionVisitor.cs
index 2e55c54919b..886a9fd6738 100644
--- a/src/EFCore/Query/Internal/QueryableMethodNormalizingExpressionVisitor.cs
+++ b/src/EFCore/Query/Internal/QueryableMethodNormalizingExpressionVisitor.cs
@@ -173,10 +173,10 @@ private Expression ExtractQueryMetadata(MethodCallExpression methodCallExpressio
return visitedExpression;
}
- if (genericMethodDefinition == EntityFrameworkQueryableExtensions.IgnoreEagerLoadedNavigationsMethodInfo)
+ if (genericMethodDefinition == EntityFrameworkQueryableExtensions.IgnoreAutoIncludesMethodInfo)
{
var visitedExpression = Visit(methodCallExpression.Arguments[0]);
- _queryCompilationContext.IgnoreEagerLoadedNavigations = true;
+ _queryCompilationContext.IgnoreAutoIncludes = true;
return visitedExpression;
}
diff --git a/src/EFCore/Query/QueryCompilationContext.cs b/src/EFCore/Query/QueryCompilationContext.cs
index f3ba576e24e..4851d295956 100644
--- a/src/EFCore/Query/QueryCompilationContext.cs
+++ b/src/EFCore/Query/QueryCompilationContext.cs
@@ -121,7 +121,7 @@ public QueryCompilationContext(
///
/// A value indicating whether eager loaded navigations are ignored in this query.
///
- public virtual bool IgnoreEagerLoadedNavigations { get; internal set; }
+ public virtual bool IgnoreAutoIncludes { get; internal set; }
///
/// The set of tags applied to this query.
///
diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs
index 533013a59a9..8b97356d11d 100644
--- a/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs
@@ -7623,7 +7623,7 @@ public BugContext21355(DbContextOptions options)
#region Issue21540
[ConditionalFact]
- public virtual void Can_eager_loaded_navigation_from_model()
+ public virtual void Can_auto_include_navigation_from_model()
{
using (CreateDatabase21540())
{
@@ -7653,12 +7653,12 @@ FROM [JoinEntity21540] AS [j]
}
[ConditionalFact]
- public virtual void Can_ignore_eager_loaded_navigation_from_model()
+ public virtual void Can_ignore_auto_included_navigation_from_model()
{
using (CreateDatabase21540())
{
using var context = new MyContext21540(_options);
- var query = context.Parents.AsNoTracking().IgnoreEagerLoadedNavigations().ToList();
+ var query = context.Parents.AsNoTracking().IgnoreAutoIncludes().ToList();
var result = Assert.Single(query);
Assert.NotNull(result.OwnedReference);
@@ -7732,9 +7732,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
.HasKey(e => new { e.ParentId, e.OtherSideId });
modelBuilder.Entity().OwnsOne(e => e.OwnedReference);
- modelBuilder.Entity().Navigation(e => e.Reference).IsEagerLoaded();
- modelBuilder.Entity().Navigation(e => e.Collection).IsEagerLoaded();
- modelBuilder.Entity().Navigation(e => e.SkipOtherSide).IsEagerLoaded();
+ modelBuilder.Entity().Navigation(e => e.Reference).AutoInclude();
+ modelBuilder.Entity().Navigation(e => e.Collection).AutoInclude();
+ modelBuilder.Entity().Navigation(e => e.SkipOtherSide).AutoInclude();
}
}
diff --git a/test/EFCore.Tests/Metadata/Internal/InternalNavigationBuilderTest.cs b/test/EFCore.Tests/Metadata/Internal/InternalNavigationBuilderTest.cs
index f4a1b4ede6e..333c6a24a07 100644
--- a/test/EFCore.Tests/Metadata/Internal/InternalNavigationBuilderTest.cs
+++ b/test/EFCore.Tests/Metadata/Internal/InternalNavigationBuilderTest.cs
@@ -129,28 +129,28 @@ public void Can_only_override_lower_or_equal_source_IsEagerLoaded()
Assert.False(metadata.IsEagerLoaded);
Assert.Null(metadata.GetIsEagerLoadedConfigurationSource());
- Assert.True(builder.CanSetIsEagerLoaded(eagerLoaded: true, ConfigurationSource.DataAnnotation));
- Assert.NotNull(builder.IsEagerLoaded(eagerLoaded: true, ConfigurationSource.DataAnnotation));
+ Assert.True(builder.CanSetAutoInclude(autoInclude: true, ConfigurationSource.DataAnnotation));
+ Assert.NotNull(builder.AutoInclude(autoInclude: true, ConfigurationSource.DataAnnotation));
Assert.True(metadata.IsEagerLoaded);
Assert.Equal(ConfigurationSource.DataAnnotation, metadata.GetIsEagerLoadedConfigurationSource());
- Assert.True(builder.CanSetIsEagerLoaded(eagerLoaded: true, ConfigurationSource.Convention));
- Assert.False(builder.CanSetIsEagerLoaded(eagerLoaded: false, ConfigurationSource.Convention));
- Assert.NotNull(builder.IsEagerLoaded(eagerLoaded: true, ConfigurationSource.Convention));
- Assert.Null(builder.IsEagerLoaded(eagerLoaded: false, ConfigurationSource.Convention));
+ Assert.True(builder.CanSetAutoInclude(autoInclude: true, ConfigurationSource.Convention));
+ Assert.False(builder.CanSetAutoInclude(autoInclude: false, ConfigurationSource.Convention));
+ Assert.NotNull(builder.AutoInclude(autoInclude: true, ConfigurationSource.Convention));
+ Assert.Null(builder.AutoInclude(autoInclude: false, ConfigurationSource.Convention));
Assert.True(metadata.IsEagerLoaded);
Assert.Equal(ConfigurationSource.DataAnnotation, metadata.GetIsEagerLoadedConfigurationSource());
- Assert.True(builder.CanSetIsEagerLoaded(eagerLoaded: false, ConfigurationSource.DataAnnotation));
- Assert.NotNull(builder.IsEagerLoaded(eagerLoaded: false, ConfigurationSource.DataAnnotation));
+ Assert.True(builder.CanSetAutoInclude(autoInclude: false, ConfigurationSource.DataAnnotation));
+ Assert.NotNull(builder.AutoInclude(autoInclude: false, ConfigurationSource.DataAnnotation));
Assert.False(metadata.IsEagerLoaded);
Assert.Equal(ConfigurationSource.DataAnnotation, metadata.GetIsEagerLoadedConfigurationSource());
- Assert.True(builder.CanSetIsEagerLoaded(null, ConfigurationSource.DataAnnotation));
- Assert.NotNull(builder.IsEagerLoaded(null, ConfigurationSource.DataAnnotation));
+ Assert.True(builder.CanSetAutoInclude(null, ConfigurationSource.DataAnnotation));
+ Assert.NotNull(builder.AutoInclude(null, ConfigurationSource.DataAnnotation));
Assert.False(metadata.IsEagerLoaded);
Assert.Null(metadata.GetIsEagerLoadedConfigurationSource());
diff --git a/test/EFCore.Tests/Metadata/Internal/InternalSkipNavigationBuilderTest.cs b/test/EFCore.Tests/Metadata/Internal/InternalSkipNavigationBuilderTest.cs
index 554bae98d5e..7ea37193d65 100644
--- a/test/EFCore.Tests/Metadata/Internal/InternalSkipNavigationBuilderTest.cs
+++ b/test/EFCore.Tests/Metadata/Internal/InternalSkipNavigationBuilderTest.cs
@@ -219,28 +219,28 @@ public void Can_only_override_lower_or_equal_source_IsEagerLoaded()
Assert.False(metadata.IsEagerLoaded);
Assert.Null(metadata.GetIsEagerLoadedConfigurationSource());
- Assert.True(builder.CanSetIsEagerLoaded(eagerLoaded: true, ConfigurationSource.DataAnnotation));
- Assert.NotNull(builder.IsEagerLoaded(eagerLoaded: true, ConfigurationSource.DataAnnotation));
+ Assert.True(builder.CanSetAutoInclude(autoInclude: true, ConfigurationSource.DataAnnotation));
+ Assert.NotNull(builder.AutoInclude(autoInclude: true, ConfigurationSource.DataAnnotation));
Assert.True(metadata.IsEagerLoaded);
Assert.Equal(ConfigurationSource.DataAnnotation, metadata.GetIsEagerLoadedConfigurationSource());
- Assert.True(builder.CanSetIsEagerLoaded(eagerLoaded: true, ConfigurationSource.Convention));
- Assert.False(builder.CanSetIsEagerLoaded(eagerLoaded: false, ConfigurationSource.Convention));
- Assert.NotNull(builder.IsEagerLoaded(eagerLoaded: true, ConfigurationSource.Convention));
- Assert.Null(builder.IsEagerLoaded(eagerLoaded: false, ConfigurationSource.Convention));
+ Assert.True(builder.CanSetAutoInclude(autoInclude: true, ConfigurationSource.Convention));
+ Assert.False(builder.CanSetAutoInclude(autoInclude: false, ConfigurationSource.Convention));
+ Assert.NotNull(builder.AutoInclude(autoInclude: true, ConfigurationSource.Convention));
+ Assert.Null(builder.AutoInclude(autoInclude: false, ConfigurationSource.Convention));
Assert.True(metadata.IsEagerLoaded);
Assert.Equal(ConfigurationSource.DataAnnotation, metadata.GetIsEagerLoadedConfigurationSource());
- Assert.True(builder.CanSetIsEagerLoaded(eagerLoaded: false, ConfigurationSource.DataAnnotation));
- Assert.NotNull(builder.IsEagerLoaded(eagerLoaded: false, ConfigurationSource.DataAnnotation));
+ Assert.True(builder.CanSetAutoInclude(autoInclude: false, ConfigurationSource.DataAnnotation));
+ Assert.NotNull(builder.AutoInclude(autoInclude: false, ConfigurationSource.DataAnnotation));
Assert.False(metadata.IsEagerLoaded);
Assert.Equal(ConfigurationSource.DataAnnotation, metadata.GetIsEagerLoadedConfigurationSource());
- Assert.True(builder.CanSetIsEagerLoaded(null, ConfigurationSource.DataAnnotation));
- Assert.NotNull(builder.IsEagerLoaded(null, ConfigurationSource.DataAnnotation));
+ Assert.True(builder.CanSetAutoInclude(null, ConfigurationSource.DataAnnotation));
+ Assert.NotNull(builder.AutoInclude(null, ConfigurationSource.DataAnnotation));
Assert.False(metadata.IsEagerLoaded);
Assert.Null(metadata.GetIsEagerLoadedConfigurationSource());