## v0.3.19

- 兼容 GetTableByEntity 有可能因为传入数组类型的错误;
- 修复 UnitOfWork 事务创建逻辑 bug;
- 增加 FreeSql.DbContext 扩展包;
- 调整 UnitOfWork、DbContext 不提交时默认会回滚;
This commit is contained in:
28810
2019-03-20 11:47:04 +08:00
parent 1dccf99bdb
commit 3fd971b78b
21 changed files with 488 additions and 15 deletions

View File

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>0.3.18</Version>
<Version>0.3.19</Version>
<Authors>YeXiangQin</Authors>
<Description>FreeSql Implementation of General Repository, Support MySql/SqlServer/PostgreSQL/Oracle/Sqlite, and read/write separation、and split table.</Description>
<PackageProjectUrl>https://github.com/2881099/FreeSql/wiki/Repository</PackageProjectUrl>

View File

@ -94,7 +94,7 @@ namespace FreeSql {
public Task<int> UpdateAsync(TEntity entity) => OrmUpdate(entity).ExecuteAffrowsAsync();
protected ISelect<TEntity> OrmSelect(object dywhere) {
var select = _fsql.Select<TEntity>(dywhere).WithTransaction(_unitOfWork?.GetOrBeginTransaction());
var select = _fsql.Select<TEntity>(dywhere).WithTransaction(_unitOfWork?.GetOrBeginTransaction(false));
var filters = (DataFilter as DataFilter<TEntity>)._filters.Where(a => a.Value.IsEnabled == true);
foreach (var filter in filters) select.Where(filter.Value.Expression);
return select.AsTable(AsTableSelect);

View File

@ -12,8 +12,6 @@ namespace FreeSql {
Object<DbConnection> _conn;
DbTransaction _tran;
bool _isCommitOrRoolback = false;
public UnitOfWork(IFreeSql fsql) {
_fsql = fsql;
}
@ -23,10 +21,10 @@ namespace FreeSql {
_tran = null;
_conn = null;
}
internal DbTransaction GetOrBeginTransaction() {
_isCommitOrRoolback = false;
internal DbTransaction GetOrBeginTransaction(bool isCreate = true) {
if (_tran != null) return _tran;
if (isCreate == false) return null;
if (_conn != null) _fsql.Ado.MasterPool.Return(_conn);
_conn = _fsql.Ado.MasterPool.Get();
@ -43,27 +41,22 @@ namespace FreeSql {
if (_tran != null) {
try {
_tran.Commit();
_isCommitOrRoolback = true;
} finally {
ReturnObject();
}
}
}
public void Rollback() {
_isCommitOrRoolback = true;
if (_tran != null) {
try {
_tran.Rollback();
_isCommitOrRoolback = true;
} finally {
ReturnObject();
}
}
}
public void Dispose() {
if (_isCommitOrRoolback == false) {
this.Commit();
}
this.Rollback();
}
public DefaultRepository<TEntity, TKey> GetRepository<TEntity, TKey>(Expression<Func<TEntity, bool>> filter = null) where TEntity : class {