tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-19 04:18:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 优化 FreeSql.DbContext 构造方法，方便注入使用；

Browse Source
This commit is contained in:
28810
2019-10-23 12:32:47 +08:00
parent aaed0334b8
commit cb55f51413
4 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
FreeSql.DbContext/DbContext/DbContext.cs
View File

@ -54,13 +54,19 @@ namespace FreeSql
}
#endregion
protected DbContext()
protected DbContext() : this(null, null) { }
protected DbContext(IFreeSql fsql, DbContextOptions options)
{
var builder = new DbContextOptionsBuilder();
OnConfiguring(builder);
_ormPriv = builder._fsql;
_optionsPriv = builder._options;
_ormPriv = fsql;
_optionsPriv = options;
if (_ormPriv == null)
{
var builder = new DbContextOptionsBuilder();
OnConfiguring(builder);
_ormPriv = builder._fsql;
_optionsPriv = builder._options;
}
if (_ormPriv != null) InitPropSets();
}
protected virtual void OnConfiguring(DbContextOptionsBuilder builder) { }

12
FreeSql.DbContext/Extensions/DependencyInjection.cs
View File

@ -12,7 +12,17 @@ namespace FreeSql
{
services.AddScoped(dbContextType, sp =>
{
var ctx = Activator.CreateInstance(dbContextType) as DbContext;
DbContext ctx = null;
try
{
var ctor = dbContextType.GetConstructors().FirstOrDefault();
var ctorParams = ctor.GetParameters().Select(a => sp.GetService(a.ParameterType)).ToArray();
ctx = Activator.CreateInstance(dbContextType, ctorParams) as DbContext;
}
catch(Exception ex)
{
throw new Exception($"AddFreeDbContext 发生错误，请检查 {dbContextType.Name} 的构造参数都已正确注入", ex);
}
if (ctx != null && ctx._ormPriv == null)
{
var builder = new DbContextOptionsBuilder();