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

- 优化 IUnitOfWork/DbContext/Repository .Orm.Ado 和 CRUD 都与自身事务保持一致；

Browse Source
This commit is contained in:
2881099
2020-12-03 23:57:26 +08:00
parent 7323b2d093
commit eae4fa4a86
25 changed files with 76 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs
View File

@ -17,7 +17,7 @@ namespace FreeSql.Internal.CommonProvider
public abstract partial class AdoProvider : IAdo, IDisposable
{
protected abstract void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex);
public abstract void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex);
public abstract DbCommand CreateCommand();
public abstract DbParameter[] GetDbParamtersByObject(string sql, object obj);
public DbParameter[] GetDbParamtersByObject(object obj) => GetDbParamtersByObject("*", obj);
@ -27,14 +27,15 @@ namespace FreeSql.Internal.CommonProvider
public IObjectPool<DbConnection> MasterPool { get; protected set; }
public List<IObjectPool<DbConnection>> SlavePools { get; } = new List<IObjectPool<DbConnection>>();
public DataType DataType { get; }
public string ConnectionString { get; }
public string[] SlaveConnectionStrings { get; }
public Guid Identifier { get; }
public string ConnectionString { get; protected set; }
public string[] SlaveConnectionStrings { get; protected set; }
public Guid Identifier { get; protected set; }
protected CommonUtils _util { get; set; }
protected int slaveUnavailables = 0;
private object slaveLock = new object();
private Random slaveRandom = new Random();
protected Func<DbTransaction> ResolveTransaction;
public AdoProvider(DataType dataType, string connectionString, string[] slaveConnectionStrings)
{
@ -876,7 +877,7 @@ namespace FreeSql.Internal.CommonProvider
if (connection == null)
{
var tran = transaction ?? TransactionCurrentThread;
var tran = transaction ?? ResolveTransaction?.Invoke() ?? TransactionCurrentThread;
if (tran != null && connection == null)
{
cmd.Connection = tran.Connection;

2
FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs
View File

@ -782,7 +782,7 @@ namespace FreeSql.Internal.CommonProvider
if (connection == null)
{
var tran = transaction;
var tran = transaction ?? ResolveTransaction?.Invoke();
if (tran != null)
{