From 766c5e97d3dd361dec986ae91d28908e4bfddb91 Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Tue, 17 May 2022 12:31:51 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BC=98=E5=8C=96=20=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8F=90=E7=A4=BA=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Examples/orm_vs/Program.cs | 34 +++++++++++++------ .../orm_vs/Properties/launchSettings.json | 8 ----- Examples/orm_vs/orm_vs.csproj | 8 +---- FreeSql/Internal/ObjectPool/ObjectPool.cs | 2 +- .../ClickHouseAdo/ClickHouseConnectionPool.cs | 4 +-- .../DamengAdo/DamengConnectionPool.cs | 4 +-- .../FirebirdAdo/FirebirdConnectionPool.cs | 4 +-- .../GBaseAdo/GBaseConnectionPool.cs | 4 +-- .../KingbaseESAdo/KingbaseESConnectionPool.cs | 4 +-- .../MsAccessAdo/MsAccessConnectionPool.cs | 4 +-- .../MySqlAdo/MySqlConnectionPool.cs | 4 +-- .../OdbcDamengAdo/OdbcDamengConnectionPool.cs | 4 +-- .../Default/OdbcAdo/OdbcConnectionPool.cs | 4 +-- .../OdbcKingbaseESConnectionPool.cs | 4 +-- .../OdbcMySqlAdo/OdbcMySqlConnectionPool.cs | 4 +-- .../OdbcOracleAdo/OdbcOracleConnectionPool.cs | 4 +-- .../OdbcPostgreSQLConnectionPool.cs | 4 +-- .../OdbcSqlServerConnectionPool.cs | 4 +-- .../OracleAdo/OracleConnectionPool.cs | 4 +-- .../PostgreSQLAdo/PostgreSQLConnectionPool.cs | 4 +-- .../ShenTongAdo/ShenTongConnectionPool.cs | 4 +-- .../SqlServerAdo/SqlServerConnectionPool.cs | 4 +-- .../SqliteAdo/SqliteConnectionPool.cs | 4 +-- 23 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 Examples/orm_vs/Properties/launchSettings.json diff --git a/Examples/orm_vs/Program.cs b/Examples/orm_vs/Program.cs index 262b9816..f1259d36 100644 --- a/Examples/orm_vs/Program.cs +++ b/Examples/orm_vs/Program.cs @@ -28,17 +28,25 @@ namespace orm_vs static SqlSugarClient sugar { - get => new SqlSugarClient(new ConnectionConfig() + get { - //ConnectionString = "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Min Pool Size=20;Max Pool Size=20", - //DbType = DbType.SqlServer, - ConnectionString = "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Min Pool Size=20;Max Pool Size=20", - DbType = DbType.MySql, - //ConnectionString = "Host=192.168.164.10;Port=5432;Username=postgres;Password=123456;Database=tedb;Pooling=true;Maximum Pool Size=21", - //DbType = DbType.PostgreSQL, - IsAutoCloseConnection = true, - InitKeyType = InitKeyType.Attribute - }); + var db = new SqlSugarClient(new ConnectionConfig() + { + //ConnectionString = "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Min Pool Size=20;Max Pool Size=20", + //DbType = DbType.SqlServer, + ConnectionString = "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Min Pool Size=20;Max Pool Size=20", + DbType = DbType.MySql, + //ConnectionString = "Host=192.168.164.10;Port=5432;Username=postgres;Password=123456;Database=tedb;Pooling=true;Maximum Pool Size=21", + //DbType = DbType.PostgreSQL, + IsAutoCloseConnection = true, + InitKeyType = InitKeyType.Attribute + }); + db.Aop.OnLogExecuting = (sql, pars) => + { + Console.WriteLine(sql);//输出sql,查看执行sql + }; + return db; + } } class SongContext : DbContext @@ -83,6 +91,12 @@ namespace orm_vs var sql222 = fsql.Select().Where(a => DateTime.Now.Subtract(a.create_time.Value).TotalHours > 0).ToSql(); + var conModels = new List(); + conModels.Add(new ConditionalModel { FieldName = "`id` = 1 or 1=1; delete from song_tag; -- ", ConditionalType = ConditionalType.Equal, FieldValue = "1" }); + + var student = sugar.Queryable().Where(conModels).ToList(); + + #region ET test ////var t31 = fsql.Select().ToList(); //fsql.Select().First(); diff --git a/Examples/orm_vs/Properties/launchSettings.json b/Examples/orm_vs/Properties/launchSettings.json deleted file mode 100644 index 33504c94..00000000 --- a/Examples/orm_vs/Properties/launchSettings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "profiles": { - "WSL": { - "commandName": "WSL2", - "distributionName": "" - } - } -} \ No newline at end of file diff --git a/Examples/orm_vs/orm_vs.csproj b/Examples/orm_vs/orm_vs.csproj index a7a240e4..08ab5687 100644 --- a/Examples/orm_vs/orm_vs.csproj +++ b/Examples/orm_vs/orm_vs.csproj @@ -10,7 +10,7 @@ - + @@ -20,10 +20,4 @@ - - - ..\..\..\..\..\..\..\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.entityframeworkcore\2.2.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll - - - diff --git a/FreeSql/Internal/ObjectPool/ObjectPool.cs b/FreeSql/Internal/ObjectPool/ObjectPool.cs index d75d684e..fd8fbb0c 100644 --- a/FreeSql/Internal/ObjectPool/ObjectPool.cs +++ b/FreeSql/Internal/ObjectPool/ObjectPool.cs @@ -279,7 +279,7 @@ namespace FreeSql.Internal.ObjectPool if (checkAvailable && UnavailableException != null) throw new Exception($"【{Policy.Name}】Block access and wait for recovery: {UnavailableException?.Message}, see: https://github.com/dotnetcore/FreeSql/discussions/1080", UnavailableException); - //throw new Exception($"【{Policy.Name}】状态不可用，等待后台检查程序恢复方可使用。{UnavailableException?.Message}"); + //throw new Exception($"【{Policy.Name}】Block access and wait for recovery: {UnavailableException?.Message}"); if ((_freeObjects.TryPop(out var obj) == false || obj == null) && _allObjects.Count < Policy.PoolSize) { diff --git a/Providers/FreeSql.Provider.ClickHouse/ClickHouseAdo/ClickHouseConnectionPool.cs b/Providers/FreeSql.Provider.ClickHouse/ClickHouseAdo/ClickHouseConnectionPool.cs index eb1bd06f..1cc335ea 100644 --- a/Providers/FreeSql.Provider.ClickHouse/ClickHouseAdo/ClickHouseConnectionPool.cs +++ b/Providers/FreeSql.Provider.ClickHouse/ClickHouseAdo/ClickHouseConnectionPool.cs @@ -154,7 +154,7 @@ namespace FreeSql.ClickHouse catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -184,7 +184,7 @@ namespace FreeSql.ClickHouse catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.Dameng/DamengAdo/DamengConnectionPool.cs b/Providers/FreeSql.Provider.Dameng/DamengAdo/DamengConnectionPool.cs index c7085cc2..709d0875 100644 --- a/Providers/FreeSql.Provider.Dameng/DamengAdo/DamengConnectionPool.cs +++ b/Providers/FreeSql.Provider.Dameng/DamengAdo/DamengConnectionPool.cs @@ -150,7 +150,7 @@ namespace FreeSql.Dameng catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -180,7 +180,7 @@ namespace FreeSql.Dameng catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.Firebird/FirebirdAdo/FirebirdConnectionPool.cs b/Providers/FreeSql.Provider.Firebird/FirebirdAdo/FirebirdConnectionPool.cs index 65961f26..afb4c3cc 100644 --- a/Providers/FreeSql.Provider.Firebird/FirebirdAdo/FirebirdConnectionPool.cs +++ b/Providers/FreeSql.Provider.Firebird/FirebirdAdo/FirebirdConnectionPool.cs @@ -134,7 +134,7 @@ namespace FreeSql.Firebird catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -164,7 +164,7 @@ namespace FreeSql.Firebird catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.GBase/GBaseAdo/GBaseConnectionPool.cs b/Providers/FreeSql.Provider.GBase/GBaseAdo/GBaseConnectionPool.cs index 5c803c21..5f61046e 100644 --- a/Providers/FreeSql.Provider.GBase/GBaseAdo/GBaseConnectionPool.cs +++ b/Providers/FreeSql.Provider.GBase/GBaseAdo/GBaseConnectionPool.cs @@ -133,7 +133,7 @@ namespace FreeSql.GBase catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -163,7 +163,7 @@ namespace FreeSql.GBase catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.KingbaseES/KingbaseESAdo/KingbaseESConnectionPool.cs b/Providers/FreeSql.Provider.KingbaseES/KingbaseESAdo/KingbaseESConnectionPool.cs index f5dec5c9..048119c9 100644 --- a/Providers/FreeSql.Provider.KingbaseES/KingbaseESAdo/KingbaseESConnectionPool.cs +++ b/Providers/FreeSql.Provider.KingbaseES/KingbaseESAdo/KingbaseESConnectionPool.cs @@ -155,7 +155,7 @@ namespace FreeSql.KingbaseES catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -185,7 +185,7 @@ namespace FreeSql.KingbaseES catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs b/Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs index 0c019330..7ccc7f1b 100644 --- a/Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs +++ b/Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs @@ -138,7 +138,7 @@ namespace FreeSql.MsAccess catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -169,7 +169,7 @@ namespace FreeSql.MsAccess catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs b/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs index f9a6b7a7..ecde7d58 100644 --- a/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs +++ b/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs @@ -138,7 +138,7 @@ namespace FreeSql.MySql catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -168,7 +168,7 @@ namespace FreeSql.MySql catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs index 76c2a573..d0570fed 100644 --- a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs +++ b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs @@ -155,7 +155,7 @@ namespace FreeSql.Odbc.Dameng catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -185,7 +185,7 @@ namespace FreeSql.Odbc.Dameng catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcConnectionPool.cs index 783b2db9..86094ee0 100644 --- a/Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcConnectionPool.cs +++ b/Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcConnectionPool.cs @@ -139,7 +139,7 @@ namespace FreeSql.Odbc.Default catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -170,7 +170,7 @@ namespace FreeSql.Odbc.Default catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESAdo/OdbcKingbaseESConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESAdo/OdbcKingbaseESConnectionPool.cs index 60010ae2..f9e989ff 100644 --- a/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESAdo/OdbcKingbaseESConnectionPool.cs +++ b/Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESAdo/OdbcKingbaseESConnectionPool.cs @@ -155,7 +155,7 @@ namespace FreeSql.Odbc.KingbaseES catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -185,7 +185,7 @@ namespace FreeSql.Odbc.KingbaseES catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs index df2e22c7..e1b4ce1b 100644 --- a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs +++ b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs @@ -133,7 +133,7 @@ namespace FreeSql.Odbc.MySql catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -163,7 +163,7 @@ namespace FreeSql.Odbc.MySql catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs index 0da4b66a..7505b033 100644 --- a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs +++ b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs @@ -155,7 +155,7 @@ namespace FreeSql.Odbc.Oracle catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -185,7 +185,7 @@ namespace FreeSql.Odbc.Oracle catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs index a6fb1096..638fe5b3 100644 --- a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs +++ b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs @@ -145,7 +145,7 @@ namespace FreeSql.Odbc.PostgreSQL catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -175,7 +175,7 @@ namespace FreeSql.Odbc.PostgreSQL catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs index 70906e5a..745b924c 100644 --- a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs +++ b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs @@ -139,7 +139,7 @@ namespace FreeSql.Odbc.SqlServer catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -170,7 +170,7 @@ namespace FreeSql.Odbc.SqlServer catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.Oracle/OracleAdo/OracleConnectionPool.cs b/Providers/FreeSql.Provider.Oracle/OracleAdo/OracleConnectionPool.cs index 3af56509..68865e20 100644 --- a/Providers/FreeSql.Provider.Oracle/OracleAdo/OracleConnectionPool.cs +++ b/Providers/FreeSql.Provider.Oracle/OracleAdo/OracleConnectionPool.cs @@ -156,7 +156,7 @@ namespace FreeSql.Oracle catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -186,7 +186,7 @@ namespace FreeSql.Oracle catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLConnectionPool.cs b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLConnectionPool.cs index cce2e648..2708ac47 100644 --- a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLConnectionPool.cs +++ b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLConnectionPool.cs @@ -146,7 +146,7 @@ namespace FreeSql.PostgreSQL catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -176,7 +176,7 @@ namespace FreeSql.PostgreSQL catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.ShenTong/ShenTongAdo/ShenTongConnectionPool.cs b/Providers/FreeSql.Provider.ShenTong/ShenTongAdo/ShenTongConnectionPool.cs index a375a4f7..cc63202a 100644 --- a/Providers/FreeSql.Provider.ShenTong/ShenTongAdo/ShenTongConnectionPool.cs +++ b/Providers/FreeSql.Provider.ShenTong/ShenTongAdo/ShenTongConnectionPool.cs @@ -144,7 +144,7 @@ namespace FreeSql.ShenTong catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -174,7 +174,7 @@ namespace FreeSql.ShenTong catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs index 32b12918..922d9ee9 100644 --- a/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs +++ b/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs @@ -144,7 +144,7 @@ namespace FreeSql.SqlServer catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -174,7 +174,7 @@ namespace FreeSql.SqlServer catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } diff --git a/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs b/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs index 7ed19d00..f5677b1a 100644 --- a/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs +++ b/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs @@ -173,7 +173,7 @@ namespace FreeSql.Sqlite catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } } @@ -203,7 +203,7 @@ namespace FreeSql.Sqlite catch (Exception ex) { if (_pool.SetUnavailable(ex) == true) - throw new Exception($"【{this.Name}】状态不可用，等待后台检查程序恢复方可使用。{ex.Message}"); + throw new Exception($"【{this.Name}】Block access and wait for recovery: {ex.Message}"); } } }