lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-08-23 22:11:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Synchronization code

Browse Source
This commit is contained in:
sunkaixuan 2024-04-10 15:18:26 +08:00
parent b52ad1d046
commit 458823d1dd
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs
View File

@ -1820,7 +1820,14 @@ namespace SqlSugar
var moreSetts = this.Context.CurrentConnectionConfig.MoreSettings; var moreSetts = this.Context.CurrentConnectionConfig.MoreSettings;
if (moreSetts != null && moreSetts.IsWithNoLockQuery && string.IsNullOrEmpty(QueryBuilder.TableWithString)) if (moreSetts != null && moreSetts.IsWithNoLockQuery && string.IsNullOrEmpty(QueryBuilder.TableWithString))
{ {
this.With(SqlWith.NoLock); if (moreSetts.DisableWithNoLockWithTran&&this.Context.Ado.IsAnyTran())
{
//No With(nolock)
}
else
{
this.With(SqlWith.NoLock);
}
} }
} }
protected List<TResult> GetData<TResult>(KeyValuePair<string, List<SugarParameter>> sqlObj) protected List<TResult> GetData<TResult>(KeyValuePair<string, List<SugarParameter>> sqlObj)

1
Src/Asp.Net/SqlSugar/Entities/ConnMoreSettings.cs
View File

@ -9,6 +9,7 @@ namespace SqlSugar
{ {
public bool IsAutoRemoveDataCache { get; set; } public bool IsAutoRemoveDataCache { get; set; }
public bool IsWithNoLockQuery { get; set; } public bool IsWithNoLockQuery { get; set; }
public bool DisableWithNoLockWithTran { get; set; }
public bool IsWithNoLockSubquery { get; set; } public bool IsWithNoLockSubquery { get; set; }
public bool DisableNvarchar { get; set; } public bool DisableNvarchar { get; set; }

1
Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs
View File

@ -641,6 +641,7 @@ namespace SqlSugar
PgSqlIsAutoToLowerCodeFirst= it.MoreSettings.PgSqlIsAutoToLowerCodeFirst, PgSqlIsAutoToLowerCodeFirst= it.MoreSettings.PgSqlIsAutoToLowerCodeFirst,
IsAutoRemoveDataCache = it.MoreSettings.IsAutoRemoveDataCache, IsAutoRemoveDataCache = it.MoreSettings.IsAutoRemoveDataCache,
IsWithNoLockQuery = it.MoreSettings.IsWithNoLockQuery, IsWithNoLockQuery = it.MoreSettings.IsWithNoLockQuery,
DisableWithNoLockWithTran=it.MoreSettings.DisableWithNoLockWithTran,
TableEnumIsString = it.MoreSettings.TableEnumIsString, TableEnumIsString = it.MoreSettings.TableEnumIsString,
DisableMillisecond = it.MoreSettings.DisableMillisecond, DisableMillisecond = it.MoreSettings.DisableMillisecond,
DbMinDate=it.MoreSettings.DbMinDate, DbMinDate=it.MoreSettings.DbMinDate,