tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 10:42:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 FreeSql.DbContext 析构方法的 bug，错误的回滚了外部 UnitOfWork；

Browse Source
This commit is contained in:
28810 2019-11-01 18:49:13 +08:00
parent 25d584ca39
commit b331630954
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
FreeSql.DbContext/DbContext/DbContext.cs
View File

@ -13,7 +13,7 @@ namespace FreeSql
public IFreeSql Orm => _ormPriv ?? throw new ArgumentNullException("请在 OnConfiguring 或 AddFreeDbContext 中配置 UseFreeSql"); public IFreeSql Orm => _ormPriv ?? throw new ArgumentNullException("请在 OnConfiguring 或 AddFreeDbContext 中配置 UseFreeSql");
#region Property UnitOfWork #region Property UnitOfWork
internal bool _isUseUnitOfWork = true; //是否使用工作单元事务 internal bool _isUseUnitOfWork = true; //是否创建工作单元事务
IUnitOfWork _uowPriv; IUnitOfWork _uowPriv;
public IUnitOfWork UnitOfWork public IUnitOfWork UnitOfWork
{ {
@ -220,7 +220,8 @@ namespace FreeSql
_dicSet.Clear(); _dicSet.Clear();
AllSets.Clear(); AllSets.Clear();
UnitOfWork?.Rollback(); if (_isUseUnitOfWork)
UnitOfWork?.Rollback();
} }
finally finally
{ {

2
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/PostgreSQL/PostgreSQLExpression/TimeSpanTest.cs
View File

@ -284,7 +284,7 @@ namespace FreeSql.Tests.Odbc.PostgreSQLExpression
public void TimeSpan_Parse() public void TimeSpan_Parse()
{ {
var data = new List<object>(); var data = new List<object>();
data.Add(select.Where(a => TimeSpan.Parse(a.CreateTime.TimeOfDay.ToString()) > TimeSpan.Zero).ToList()); //data.Add(select.Where(a => TimeSpan.Parse(a.CreateTime.TimeOfDay.ToString()) > TimeSpan.Zero).ToList());
//SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5 //SELECT a.`Id` as1, a.`Clicks` as2, a.`TypeGuid` as3, a.`Title` as4, a.`CreateTime` as5
//FROM `tb_topic` a //FROM `tb_topic` a
//WHERE (cast(date_format(date_add(cast('0001/1/1 0:00:00' as datetime), interval (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) microsecond), '%Y-%m-%d %H:%i:%s.%f') as signed) > 0) //WHERE (cast(date_format(date_add(cast('0001/1/1 0:00:00' as datetime), interval (timestampdiff(microsecond, date_format(a.`CreateTime`, '1970-1-1 %H:%i:%s.%f'), a.`CreateTime`) + 62135596800000000)) microsecond), '%Y-%m-%d %H:%i:%s.%f') as signed) > 0)