diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContextOptions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContextOptions.cs index f74ed57460..b87e9501d7 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContextOptions.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContextOptions.cs @@ -26,14 +26,10 @@ public class AbpDbContextOptions internal Dictionary> ConventionActions { get; } internal Action? DefaultOnModelCreatingAction { get; set; } - - internal Action? DefaultOnConfiguringAction { get; set; } - - internal Action? DefaultOnConfiguringAction { get; set; } internal Dictionary> OnModelCreatingActions { get; } - - internal Dictionary> OnConfiguringActions { get; } + + internal Action? DefaultOnConfiguringAction { get; set; } internal Dictionary> OnConfiguringActions { get; } @@ -108,27 +104,6 @@ public class AbpDbContextOptions } } - public void ConfigureDefaultOnConfiguring([NotNull] Action action, bool overrideExisting = false) - { - Check.NotNull(action, nameof(action)); - - if (overrideExisting) - { - DefaultOnConfiguringAction = action; - } - else - { - DefaultOnConfiguringAction += action; - } - } - - public void ConfigureDefaultOnConfiguring([NotNull] Action action) - { - Check.NotNull(action, nameof(action)); - - DefaultOnConfiguringAction = action; - } - public void ConfigureOnModelCreating([NotNull] Action action) where TDbContext : AbpDbContext { @@ -146,23 +121,19 @@ public class AbpDbContextOptions actions.Add(action); } - - public void ConfigureOnConfiguring([NotNull] Action action) - where TDbContext : AbpDbContext + + public void ConfigureDefaultOnConfiguring([NotNull] Action action, bool overrideExisting = false) { Check.NotNull(action, nameof(action)); - var actions = OnConfiguringActions.GetOrDefault(typeof(TDbContext)); - if (actions == null) + if (overrideExisting) { - OnConfiguringActions[typeof(TDbContext)] = new List - { - new Action((dbContext, builder) => action((TDbContext)dbContext, builder)) - }; - return; + DefaultOnConfiguringAction = action; + } + else + { + DefaultOnConfiguringAction += action; } - - actions.Add(action); } public void ConfigureOnConfiguring([NotNull] Action action)