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

- 优化 错误信息提示；

Browse Source
This commit is contained in:
2881099 2022-05-17 12:31:51 +08:00
parent a940e6996f
commit 766c5e97d3
23 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Examples/orm_vs/Program.cs
View File

@ -28,7 +28,9 @@ namespace orm_vs
static SqlSugarClient sugar
{
get => new SqlSugarClient(new ConnectionConfig()
get
{
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,
@ -39,6 +41,12 @@ namespace orm_vs
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<Song>().Where(a => DateTime.Now.Subtract(a.create_time.Value).TotalHours > 0).ToSql();
var conModels = new List<IConditionalModel>();
conModels.Add(new ConditionalModel { FieldName = "`id` = 1 or 1=1; delete from song_tag; -- ", ConditionalType = ConditionalType.Equal, FieldValue = "1" });
var student = sugar.Queryable<Song>().Where(conModels).ToList();
#region ET test
////var t31 = fsql.Select<xxx>().ToList();
//fsql.Select<Song>().First();

8
Examples/orm_vs/Properties/launchSettings.json
View File

@ -1,8 +0,0 @@
{
"profiles": {
"WSL": {
"commandName": "WSL2",
"distributionName": ""
}
}
}

8
Examples/orm_vs/orm_vs.csproj
View File

@ -10,7 +10,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.0" />
<PackageReference Include="sqlSugarCore" Version="5.0.1.2" />
<PackageReference Include="sqlSugarCore" Version="5.0.8" />
</ItemGroup>
<ItemGroup>
@ -20,10 +20,4 @@
<ProjectReference Include="..\..\Providers\FreeSql.Provider.SqlServer\FreeSql.Provider.SqlServer.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.EntityFrameworkCore">
<HintPath>..\..\..\..\..\..\..\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.entityframeworkcore\2.2.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
</Reference>
</ItemGroup>
</Project>

2
FreeSql/Internal/ObjectPool/ObjectPool.cs
View File

@ -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)
{

4
Providers/FreeSql.Provider.ClickHouse/ClickHouseAdo/ClickHouseConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.Dameng/DamengAdo/DamengConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.Firebird/FirebirdAdo/FirebirdConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.GBase/GBaseAdo/GBaseConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.KingbaseES/KingbaseESAdo/KingbaseESConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.Odbc/KingbaseES/OdbcKingbaseESAdo/OdbcKingbaseESConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.Oracle/OracleAdo/OracleConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.ShenTong/ShenTongAdo/ShenTongConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs
View File

@ -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}");
}
}
}

4
Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs
View File

@ -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}");
}
}
}