tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 18:52:50 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FreeSql.DbContext/DbContext/DbContext.cs
View File

@ -13,6 +13,10 @@ namespace FreeSql
{ {
internal DbContextScopedFreeSql _ormScoped; internal DbContextScopedFreeSql _ormScoped;
internal IFreeSql OrmOriginal => _ormScoped?._originalFsql ?? throw new ArgumentNullException("请在 OnConfiguring 或 AddFreeDbContext 中配置 UseFreeSql"); internal IFreeSql OrmOriginal => _ormScoped?._originalFsql ?? throw new ArgumentNullException("请在 OnConfiguring 或 AddFreeDbContext 中配置 UseFreeSql");
/// <summary>
/// 该对象 Select/Delete/Insert/Update/InsertOrUpdate 与 DbContext 事务保持一致，可省略传递 WithTransaction
/// </summary>
public IFreeSql Orm => _ormScoped ?? throw new ArgumentNullException("请在 OnConfiguring 或 AddFreeDbContext 中配置 UseFreeSql"); public IFreeSql Orm => _ormScoped ?? throw new ArgumentNullException("请在 OnConfiguring 或 AddFreeDbContext 中配置 UseFreeSql");
#region Property UnitOfWork #region Property UnitOfWork

36
FreeSql.DbContext/DbContext/DbContextScopedFreeSql.cs
View File

@ -1,8 +1,12 @@
using FreeSql; using FreeSql;
using FreeSql.Internal; using FreeSql.Internal;
using FreeSql.Internal.CommonProvider;
using FreeSql.Internal.Model;
using FreeSql.Internal.ObjectPool;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Data.Common;
using System.Text; using System.Text;
namespace FreeSql namespace FreeSql
@ -18,11 +22,39 @@ namespace FreeSql
{ {
if (fsql == null) return null; if (fsql == null) return null;
var scopedfsql = fsql as DbContextScopedFreeSql; var scopedfsql = fsql as DbContextScopedFreeSql;
if (scopedfsql == null) return new DbContextScopedFreeSql { _originalFsql = fsql, _resolveDbContext = resolveDbContext, _resolveUnitOfWork = resolveUnitOfWork }; if (scopedfsql == null)
return new DbContextScopedFreeSql
{
_originalFsql = fsql,
_resolveDbContext = resolveDbContext,
_resolveUnitOfWork = resolveUnitOfWork,
Ado = new ScopeTransactionAdo(fsql.Ado as AdoProvider, () =>
{
var db = resolveDbContext?.Invoke();
db?.FlushCommand();
return resolveUnitOfWork?.Invoke()?.GetOrBeginTransaction();
})
};
return Create(scopedfsql._originalFsql, resolveDbContext, resolveUnitOfWork); return Create(scopedfsql._originalFsql, resolveDbContext, resolveUnitOfWork);
} }
public IAdo Ado => _originalFsql.Ado; class ScopeTransactionAdo : AdoProvider
{
AdoProvider _ado;
public ScopeTransactionAdo(AdoProvider ado, Func<DbTransaction> resolveTran) : base(ado.DataType, null, null)
{
_ado = ado;
base.ResolveTransaction = resolveTran;
base.ConnectionString = ado.ConnectionString;
base.SlaveConnectionStrings = ado.SlaveConnectionStrings;
base.Identifier = ado.Identifier;
}
public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) => _ado.AddslashesProcessParam(param, mapType, mapColumn);
public override DbCommand CreateCommand() => _ado.CreateCommand();
public override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _ado.GetDbParamtersByObject(sql, obj);
public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) => _ado.ReturnConnection(pool, conn, ex);
}
public IAdo Ado { get; private set; }
public IAop Aop => _originalFsql.Aop; public IAop Aop => _originalFsql.Aop;
public ICodeFirst CodeFirst => _originalFsql.CodeFirst; public ICodeFirst CodeFirst => _originalFsql.CodeFirst;
public IDbFirst DbFirst => _originalFsql.DbFirst; public IDbFirst DbFirst => _originalFsql.DbFirst;

19
FreeSql.DbContext/FreeSql.DbContext.xml
View File

@ -4,6 +4,11 @@
<name>FreeSql.DbContext</name> <name>FreeSql.DbContext</name>
</assembly> </assembly>
<members> <members>
<member name="P:FreeSql.DbContext.Orm">
<summary>
该对象 Select/Delete/Insert/Update/InsertOrUpdate 与 DbContext 事务保持一致，可省略传递 WithTransaction
</summary>
</member>
<member name="M:FreeSql.DbContext.Add``1(``0)"> <member name="M:FreeSql.DbContext.Add``1(``0)">
<summary> <summary>
添加 添加
@ -343,6 +348,11 @@
工作单元 工作单元
</summary> </summary>
</member> </member>
<member name="P:FreeSql.IUnitOfWork.Orm">
<summary>
该对象 Select/Delete/Insert/Update/InsertOrUpdate 与工作单元事务保持一致，可省略传递 WithTransaction
</summary>
</member>
<member name="M:FreeSql.IUnitOfWork.GetOrBeginTransaction(System.Boolean)"> <member name="M:FreeSql.IUnitOfWork.GetOrBeginTransaction(System.Boolean)">
<summary> <summary>
开启事务，或者返回已开启的事务 开启事务，或者返回已开启的事务
@ -502,14 +512,5 @@
<param name="that"></param> <param name="that"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
<summary>
批量注入 Repository，可以参考代码自行调整
</summary>
<param name="services"></param>
<param name="globalDataFilter"></param>
<param name="assemblies"></param>
<returns></returns>
</member>
</members> </members>
</doc> </doc>

3
FreeSql.DbContext/UnitOfWork/IUnitOfWork.cs
View File

@ -10,6 +10,9 @@ namespace FreeSql
/// </summary> /// </summary>
public interface IUnitOfWork : IDisposable public interface IUnitOfWork : IDisposable
{ {
/// <summary>
/// 该对象 Select/Delete/Insert/Update/InsertOrUpdate 与工作单元事务保持一致，可省略传递 WithTransaction
/// </summary>
IFreeSql Orm { get; } IFreeSql Orm { get; }
/// <summary> /// <summary>

1
FreeSql.Tests/FreeSql.Tests.DbContext/RepositoryTests.cs
View File

@ -130,6 +130,7 @@ namespace FreeSql.Tests
flowRepos = uow.GetRepository<FlowModel>(); flowRepos = uow.GetRepository<FlowModel>();
flowRepos.Insert(flow); flowRepos.Insert(flow);
flowRepos.Orm.Select<FlowModel>().ToList(); flowRepos.Orm.Select<FlowModel>().ToList();
flowRepos.Orm.Ado.ExecuteConnectTest();
uow.Commit(); uow.Commit();
} }
} }

183
FreeSql/FreeSql.xml
View File

@ -3089,177 +3089,6 @@
<param name="parms"></param> <param name="parms"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.IAdo.ExecuteConnectTestAsync(System.Int32,System.Threading.CancellationToken)">
<summary>
测试数据库是否连接正确，本方法执行如下命令：<para></para>
MySql/SqlServer/PostgreSQL/达梦/人大金仓/神通: SELECT 1<para></para>
Oracle: SELECT 1 FROM dual<para></para>
</summary>
<param name="commandTimeout">命令超时设置(秒)</param>
<param name="cancellationToken"></param>
<returns>true: 成功, false: 失败</returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteReaderAsync(System.Func{FreeSql.Internal.Model.FetchCallbackArgs{System.Data.Common.DbDataReader},System.Threading.Tasks.Task},System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】
</summary>
<param name="readerHander"></param>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteReaderAsync(System.Func{FreeSql.Internal.Model.FetchCallbackArgs{System.Data.Common.DbDataReader},System.Threading.Tasks.Task},System.String,System.Object,System.Threading.CancellationToken)">
<summary>
查询，ExecuteReaderAsync(dr => {}, "select * from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="readerHander"></param>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteArrayAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
查询
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteArrayAsync(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
查询，ExecuteArrayAsync("select * from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataSetAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
查询
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataSetAsync(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
查询，ExecuteDataSetAsync("select * from user where age > @age; select 2", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataTableAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
查询
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteDataTableAsync(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
查询，ExecuteDataTableAsync("select * from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteNonQueryAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
在【主库】执行
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteNonQueryAsync(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
在【主库】执行，ExecuteNonQueryAsync("delete from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteScalarAsync(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
在【主库】执行
</summary>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
</member>
<member name="M:FreeSql.IAdo.ExecuteScalarAsync(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
在【主库】执行，ExecuteScalarAsync("select 1 from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``1(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > @age", new SqlParameter { ParameterName = "age", Value = 25 })
</summary>
<typeparam name="T"></typeparam>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``1(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
执行SQL返回对象集合，QueryAsync&lt;User&gt;("select * from user where age > @age", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<typeparam name="T"></typeparam>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``2(System.Data.CommandType,System.String,System.Data.Common.DbParameter[],System.Threading.CancellationToken)">
<summary>
执行SQL返回对象集合，Query&lt;User&gt;("select * from user where age > @age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 })
</summary>
<typeparam name="T1"></typeparam>
<typeparam name="T2"></typeparam>
<param name="cmdType"></param>
<param name="cmdText"></param>
<param name="cmdParms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.QueryAsync``2(System.String,System.Object,System.Threading.CancellationToken)">
<summary>
执行SQL返回对象集合，Query&lt;User, Address&gt;("select * from user where age > @age; select * from address", new { age = 25 })<para></para>
提示：parms 参数还可以传 Dictionary&lt;string, object&gt;
</summary>
<typeparam name="T1"></typeparam>
<typeparam name="T2"></typeparam>
<param name="cmdText"></param>
<param name="parms"></param>
<param name="cancellationToken"></param>
<returns></returns>
</member>
<member name="E:FreeSql.IAop.ParseExpression"> <member name="E:FreeSql.IAop.ParseExpression">
<summary> <summary>
可自定义解析表达式 可自定义解析表达式
@ -4088,12 +3917,6 @@
<param name="timeout">超时</param> <param name="timeout">超时</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.GetAsync">
<summary>
获取资源
</summary>
<returns></returns>
</member>
<member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.Return(FreeSql.Internal.ObjectPool.Object{`0},System.Boolean)"> <member name="M:FreeSql.Internal.ObjectPool.IObjectPool`1.Return(FreeSql.Internal.ObjectPool.Object{`0},System.Boolean)">
<summary> <summary>
使用完毕后，归还资源 使用完毕后，归还资源
@ -4164,12 +3987,6 @@
</summary> </summary>
<param name="obj">资源对象</param> <param name="obj">资源对象</param>
</member> </member>
<member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnGetAsync(FreeSql.Internal.ObjectPool.Object{`0})">
<summary>
从对象池获取对象成功的时候触发，通过该方法统计或初始化对象
</summary>
<param name="obj">资源对象</param>
</member>
<member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnReturn(FreeSql.Internal.ObjectPool.Object{`0})"> <member name="M:FreeSql.Internal.ObjectPool.IPolicy`1.OnReturn(FreeSql.Internal.ObjectPool.Object{`0})">
<summary> <summary>
归还对象给对象池的时候触发 归还对象给对象池的时候触发

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

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

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

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

2
Providers/FreeSql.Provider.Dameng/DamengAdo/DamengAdo.cs
View File

@ -65,7 +65,7 @@ namespace FreeSql.Dameng
return new DmCommand(); return new DmCommand();
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as DamengConnectionPool; var rawPool = pool as DamengConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);

2
Providers/FreeSql.Provider.Firebird/FirebirdAdo/FirebirdAdo.cs
View File

@ -96,7 +96,7 @@ namespace FreeSql.Firebird
return new FbCommand(); return new FbCommand();
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as FirebirdConnectionPool; var rawPool = pool as FirebirdConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);

2
Providers/FreeSql.Provider.KingbaseES/KingbaseESAdo/KingbaseESAdo.cs
View File

@ -66,7 +66,7 @@ namespace FreeSql.KingbaseES
return new KdbndpCommand(); return new KdbndpCommand();
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as KingbaseESConnectionPool; var rawPool = pool as KingbaseESConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);

2
Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessAdo.cs
View File

@ -70,7 +70,7 @@ namespace FreeSql.MsAccess
return new OleDbCommand(); return new OleDbCommand();
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as MsAccessConnectionPool; var rawPool = pool as MsAccessConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);

2
Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlAdo.cs
View File

@ -72,7 +72,7 @@ namespace FreeSql.MySql
return new MySqlCommand(); return new MySqlCommand();
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as MySqlConnectionPool; var rawPool = pool as MySqlConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);

2
Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengAdo.cs
View File

@ -66,7 +66,7 @@ namespace FreeSql.Odbc.Dameng
return new OdbcCommand(); return new OdbcCommand();
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as OdbcDamengConnectionPool; var rawPool = pool as OdbcDamengConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);

2
Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcAdo.cs
View File

@ -67,7 +67,7 @@ namespace FreeSql.Odbc.Default
return new OdbcCommand(); return new OdbcCommand();
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as OdbcConnectionPool; var rawPool = pool as OdbcConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);

2
Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESAdo/OdbcKingbaseESAdo.cs
View File

@ -66,7 +66,7 @@ namespace FreeSql.Odbc.KingbaseES
return new OdbcCommand(); return new OdbcCommand();
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as OdbcKingbaseESConnectionPool; var rawPool = pool as OdbcKingbaseESConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);

2
Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlAdo.cs
View File

@ -66,7 +66,7 @@ namespace FreeSql.Odbc.MySql
return new OdbcCommand(); return new OdbcCommand();
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as OdbcMySqlConnectionPool; var rawPool = pool as OdbcMySqlConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);

2
Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleAdo.cs
View File

@ -66,7 +66,7 @@ namespace FreeSql.Odbc.Oracle
return new OdbcCommand(); return new OdbcCommand();
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as OdbcOracleConnectionPool; var rawPool = pool as OdbcOracleConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);

2
Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLAdo.cs
View File

@ -67,7 +67,7 @@ namespace FreeSql.Odbc.PostgreSQL
return new OdbcCommand(); return new OdbcCommand();
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as OdbcPostgreSQLConnectionPool; var rawPool = pool as OdbcPostgreSQLConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);

2
Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerAdo.cs
View File

@ -80,7 +80,7 @@ namespace FreeSql.Odbc.SqlServer
return new OdbcCommand(); return new OdbcCommand();
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as OdbcSqlServerConnectionPool; var rawPool = pool as OdbcSqlServerConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);

2
Providers/FreeSql.Provider.Oracle/OracleAdo/OracleAdo.cs
View File

@ -68,7 +68,7 @@ namespace FreeSql.Oracle
return cmd; return cmd;
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as OracleConnectionPool; var rawPool = pool as OracleConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);

2
Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLAdo.cs
View File

@ -84,7 +84,7 @@ namespace FreeSql.PostgreSQL
return new NpgsqlCommand(); return new NpgsqlCommand();
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as PostgreSQLConnectionPool; var rawPool = pool as PostgreSQLConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);

2
Providers/FreeSql.Provider.ShenTong/ShenTongAdo/ShenTongAdo.cs
View File

@ -67,7 +67,7 @@ namespace FreeSql.ShenTong
return new OscarCommand(); return new OscarCommand();
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as ShenTongConnectionPool; var rawPool = pool as ShenTongConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);

2
Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerAdo.cs
View File

@ -94,7 +94,7 @@ namespace FreeSql.SqlServer
return new SqlCommand(); return new SqlCommand();
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as SqlServerConnectionPool; var rawPool = pool as SqlServerConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);

2
Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteAdo.cs
View File

@ -75,7 +75,7 @@ namespace FreeSql.Sqlite
return new SQLiteCommand(); return new SQLiteCommand();
} }
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex) public override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{ {
var rawPool = pool as SqliteConnectionPool; var rawPool = pool as SqliteConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex); if (rawPool != null) rawPool.Return(conn, ex);