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

- 增加 IAdo.ExecuteConnectTest 快速判断连接是否可用 #113；

Browse Source
This commit is contained in:
28810
2020-08-24 12:39:22 +08:00
parent d266446062
commit d951b475d9
21 changed files with 164 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
FreeSql.DbContext/FreeSql.DbContext.xml
View File

@ -532,5 +532,14 @@
<param name="that"></param>
<returns></returns>
</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>
</doc>

5
FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/MySqlConnectorAdo/MySqlAdoTest.cs
View File

@ -18,6 +18,11 @@ namespace FreeSql.Tests.MySqlConnector
var t2 = g.mysql.Ado.SlavePools.Count;
}
[Fact]
public void ExecuteTest()
{
Assert.True(g.mysql.Ado.ExecuteConnectTest());
}
[Fact]
public void ExecuteReader()
{

5
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Dameng/DamengAdo/DamengAdoTest.cs
View File

@ -18,6 +18,11 @@ namespace FreeSql.Tests.Odbc.Dameng
var t2 = g.dameng.Ado.SlavePools.Count;
}
[Fact]
public void ExecuteTest()
{
Assert.True(g.dameng.Ado.ExecuteConnectTest());
}
[Fact]
public void ExecuteReader()
{

5
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Default/OdbcAdo/OdbcAdoTest.cs
View File

@ -19,6 +19,11 @@ namespace FreeSql.Tests.Odbc.Default
var t2 = g.odbc.Ado.SlavePools.Count;
}
[Fact]
public void ExecuteTest()
{
Assert.True(g.odbc.Ado.ExecuteConnectTest());
}
[Fact]
public void ExecuteReader()
{

5
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/KingbaseES/KingbaseESAdo/KingbaseESAdoTest.cs
View File

@ -18,6 +18,11 @@ namespace FreeSql.Tests.Odbc.KingbaseES
var t2 = g.kingbaseES.Ado.SlavePools.Count;
}
[Fact]
public void ExecuteTest()
{
Assert.True(g.kingbaseES.Ado.ExecuteConnectTest());
}
[Fact]
public void ExecuteReader()
{

5
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/MySqlAdo/MySqlAdoTest.cs
View File

@ -19,6 +19,11 @@ namespace FreeSql.Tests.Odbc.MySql
var t2 = g.mysql.Ado.SlavePools.Count;
}
[Fact]
public void ExecuteTest()
{
Assert.True(g.mysql.Ado.ExecuteConnectTest());
}
[Fact]
public void ExecuteReader()
{

5
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Oracle/OracleAdo/OracleAdoTest.cs
View File

@ -18,6 +18,11 @@ namespace FreeSql.Tests.Odbc.Oracle
var t2 = g.oracle.Ado.SlavePools.Count;
}
[Fact]
public void ExecuteTest()
{
Assert.True(g.oracle.Ado.ExecuteConnectTest());
}
[Fact]
public void ExecuteReader()
{

5
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/PostgreSQL/PostgreSQLAdo/PostgreSQLAdoTest.cs
View File

@ -18,6 +18,11 @@ namespace FreeSql.Tests.Odbc.PostgreSQL
var t2 = g.pgsql.Ado.SlavePools.Count;
}
[Fact]
public void ExecuteTest()
{
Assert.True(g.pgsql.Ado.ExecuteConnectTest());
}
[Fact]
public void ExecuteReader()
{

5
FreeSql.Tests/FreeSql.Tests.Provider.Odbc/SqlServer/SqlServerAdo/SqlServerAdoTest.cs
View File

@ -20,6 +20,11 @@ namespace FreeSql.Tests.Odbc.SqlServer
var t2 = g.sqlserver.Ado.SlavePools.Count;
}
[Fact]
public void ExecuteTest()
{
Assert.True(g.sqlserver.Ado.ExecuteConnectTest());
}
[Fact]
public void ExecuteReader()
{

5
FreeSql.Tests/FreeSql.Tests/Dameng/DamengAdo/DamengAdoTest.cs
View File

@ -18,6 +18,11 @@ namespace FreeSql.Tests.Dameng
var t2 = g.dameng.Ado.SlavePools.Count;
}
[Fact]
public void ExecuteTest()
{
Assert.True(g.dameng.Ado.ExecuteConnectTest());
}
[Fact]
public void ExecuteReader()
{

6
FreeSql.Tests/FreeSql.Tests/MsAccess/MsAccessAdo/MsAccessAdoTest.cs
View File

@ -17,6 +17,12 @@ namespace FreeSql.Tests.MsAccess
{
var t2 = g.msaccess.Ado.SlavePools.Count;
}
[Fact]
public void ExecuteTest()
{
Assert.True(g.msaccess.Ado.ExecuteConnectTest());
}
[Fact]
public void ExecuteReader()
{

5
FreeSql.Tests/FreeSql.Tests/MySql/MySqlAdo/MySqlAdoTest.cs
View File

@ -18,6 +18,11 @@ namespace FreeSql.Tests.MySql
var t2 = g.mysql.Ado.SlavePools.Count;
}
[Fact]
public void ExecuteTest()
{
Assert.True(g.mysql.Ado.ExecuteConnectTest());
}
[Fact]
public void ExecuteReader()
{

5
FreeSql.Tests/FreeSql.Tests/Oracle/OracleAdo/OracleAdoTest.cs
View File

@ -18,6 +18,11 @@ namespace FreeSql.Tests.Oracle
var t2 = g.oracle.Ado.SlavePools.Count;
}
[Fact]
public void ExecuteTest()
{
Assert.True(g.oracle.Ado.ExecuteConnectTest());
}
[Fact]
public void ExecuteReader()
{

5
FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLAdo/PostgreSQLAdoTest.cs
View File

@ -18,6 +18,11 @@ namespace FreeSql.Tests.PostgreSQL
var t2 = g.pgsql.Ado.SlavePools.Count;
}
[Fact]
public void ExecuteTest()
{
Assert.True(g.pgsql.Ado.ExecuteConnectTest());
}
[Fact]
public void ExecuteReader()
{

5
FreeSql.Tests/FreeSql.Tests/ShenTong/ShenTongAdo/ShenTongAdoTest.cs
View File

@ -18,6 +18,11 @@ namespace FreeSql.Tests.ShenTong
var t2 = g.shentong.Ado.SlavePools.Count;
}
[Fact]
public void ExecuteTest()
{
Assert.True(g.shentong.Ado.ExecuteConnectTest());
}
[Fact]
public void ExecuteReader()
{

5
FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerAdo/SqlServerAdoTest.cs
View File

@ -29,6 +29,11 @@ namespace FreeSql.Tests.SqlServer
var t2 = g.sqlserver.Ado.SlavePools.Count;
}
[Fact]
public void ExecuteTest()
{
Assert.True(g.sqlserver.Ado.ExecuteConnectTest());
}
[Fact]
public void ExecuteReader()
{

6
FreeSql.Tests/FreeSql.Tests/Sqlite/SqliteAdo/SqliteAdoTest.cs
View File

@ -17,6 +17,12 @@ namespace FreeSql.Tests.Sqlite
{
var t2 = g.sqlite.Ado.SlavePools.Count;
}
[Fact]
public void ExecuteTest()
{
Assert.True(g.sqlite.Ado.ExecuteConnectTest());
}
[Fact]
public void ExecuteReader()
{

16
FreeSql/FreeSql.xml
View File

@ -2479,6 +2479,14 @@
<param name="obj">new { id = 1 } 或者 Dictionary&lt;string, object&gt;</param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteConnectTest">
<summary>
测试数据库是否连接正确，本方法执行如下命令：<para></para>
MySql/SqlServer/PostgreSQL/达梦/人大金仓/神通: SELECT 1<para></para>
Oracle: SELECT 1 FROM dual<para></para>
</summary>
<returns>true: 成功, false: 失败</returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteReader(System.Action{FreeSql.Internal.Model.FetchCallbackArgs{System.Data.Common.DbDataReader}},System.Data.CommandType,System.String,System.Data.Common.DbParameter[])">
<summary>
查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】
@ -2618,6 +2626,14 @@
<param name="parms"></param>
<returns></returns>
</member>
<member name="M:FreeSql.IAdo.ExecuteConnectTestAsync">
<summary>
测试数据库是否连接正确，本方法执行如下命令：<para></para>
MySql/SqlServer/PostgreSQL/达梦/人大金仓/神通: SELECT 1<para></para>
Oracle: SELECT 1 FROM dual<para></para>
</summary>
<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[])">
<summary>
查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】

16
FreeSql/Interface/IAdo.cs
View File

@ -62,6 +62,14 @@ namespace FreeSql
/// <returns></returns>
DbParameter[] GetDbParamtersByObject(object obj);
/// <summary>
/// 测试数据库是否连接正确，本方法执行如下命令：<para></para>
/// MySql/SqlServer/PostgreSQL/达梦/人大金仓/神通: SELECT 1<para></para>
/// Oracle: SELECT 1 FROM dual<para></para>
/// </summary>
/// <returns>true: 成功, false: 失败</returns>
bool ExecuteConnectTest();
/// <summary>
/// 查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】
/// </summary>
@ -243,6 +251,14 @@ namespace FreeSql
#if net40
#else
#region async
/// <summary>
/// 测试数据库是否连接正确，本方法执行如下命令：<para></para>
/// MySql/SqlServer/PostgreSQL/达梦/人大金仓/神通: SELECT 1<para></para>
/// Oracle: SELECT 1 FROM dual<para></para>
/// </summary>
/// <returns>true: 成功, false: 失败</returns>
Task<bool> ExecuteConnectTestAsync();
/// <summary>
/// 查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】
/// </summary>

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

@ -95,6 +95,27 @@ namespace FreeSql.Internal.CommonProvider
var props = tb?.Properties ?? type.GetPropertiesDictIgnoreCase();
return props;
}
public bool ExecuteConnectTest()
{
try
{
switch (DataType)
{
case DataType.Oracle:
case DataType.OdbcOracle:
ExecuteNonQuery(" SELECT 1 FROM dual");
return true;
}
ExecuteNonQuery(" SELECT 1");
return true;
}
catch
{
return false;
}
}
public List<T> Query<T>(string cmdText, object parms = null) => Query<T>(null, null, null, CommandType.Text, cmdText, GetDbParamtersByObject(cmdText, parms));
public List<T> Query<T>(DbTransaction transaction, string cmdText, object parms = null) => Query<T>(null, null, transaction, CommandType.Text, cmdText, GetDbParamtersByObject(cmdText, parms));
public List<T> Query<T>(DbConnection connection, DbTransaction transaction, string cmdText, object parms = null) => Query<T>(null, connection, transaction, CommandType.Text, cmdText, GetDbParamtersByObject(cmdText, parms));

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

@ -14,6 +14,26 @@ namespace FreeSql.Internal.CommonProvider
{
partial class AdoProvider
{
async public Task<bool> ExecuteConnectTestAsync()
{
try
{
switch (DataType)
{
case DataType.Oracle:
case DataType.OdbcOracle:
await ExecuteNonQueryAsync(" SELECT 1 FROM dual");
return true;
}
await ExecuteNonQueryAsync(" SELECT 1");
return true;
}
catch
{
return false;
}
}
public Task<List<T>> QueryAsync<T>(string cmdText, object parms = null) => QueryAsync<T>(null, null, null, CommandType.Text, cmdText, GetDbParamtersByObject(cmdText, parms));
public Task<List<T>> QueryAsync<T>(DbTransaction transaction, string cmdText, object parms = null) => QueryAsync<T>(null, null, transaction, CommandType.Text, cmdText, GetDbParamtersByObject(cmdText, parms));
public Task<List<T>> QueryAsync<T>(DbConnection connection, DbTransaction transaction, string cmdText, object parms = null) => QueryAsync<T>(null, connection, transaction, CommandType.Text, cmdText, GetDbParamtersByObject(cmdText, parms));