From 13d1395697cc7f020ff459baf306e7bbdcb1d9d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Sat, 14 Apr 2018 15:29:02 +0300 Subject: [PATCH] rename to DefaultWithDetailsFunc from IncludeDetailsFunc --- .../Repositories/EntityFrameworkCore/EfCoreRepository.cs | 4 ++-- .../EntityFrameworkCore/DependencyInjection/EntityOptions.cs | 2 +- .../EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs index dc4ab42088..0b2b43f5eb 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs +++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs @@ -161,12 +161,12 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore public override IQueryable WithDetails() { - if (EntityOptions.IncludeDetailsFunc == null) + if (EntityOptions.DefaultWithDetailsFunc == null) { return base.WithDetails(); } - return EntityOptions.IncludeDetailsFunc(GetQueryable()); + return EntityOptions.DefaultWithDetailsFunc(GetQueryable()); } } diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/EntityOptions.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/EntityOptions.cs index f592f96a0e..b465dcc667 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/EntityOptions.cs +++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/EntityOptions.cs @@ -11,7 +11,7 @@ namespace Volo.Abp.EntityFrameworkCore.DependencyInjection { public static EntityOptions Empty { get; } = new EntityOptions(); - public Func, IQueryable> IncludeDetailsFunc { get; set; } + public Func, IQueryable> DefaultWithDetailsFunc { get; set; } } public class EntityOptions diff --git a/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs b/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs index c5a4bca732..b46f5983cd 100644 --- a/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs +++ b/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/AbpEntityFrameworkCoreTestModule.cs @@ -30,7 +30,7 @@ namespace Volo.Abp.EntityFrameworkCore options.Entity(opt => { - opt.IncludeDetailsFunc = q => q.Include(p => p.Phones); + opt.DefaultWithDetailsFunc = q => q.Include(p => p.Phones); }); });