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

28810 · 28810 · commit d951b475d9b9 · 2020-08-24T12:39:22.000+08:00
diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/MySqlConnectorAdo/MySqlAdoTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/MySqlConnectorAdo/MySqlAdoTest.cs
@@ -18,6 +18,11 @@ public void SlavePools()
             var t2 = g.mysql.Ado.SlavePools.Count;
         }
 
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.mysql.Ado.ExecuteConnectTest());
+        }
         [Fact]
         public void ExecuteReader()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Dameng/DamengAdo/DamengAdoTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Dameng/DamengAdo/DamengAdoTest.cs
@@ -18,6 +18,11 @@ public void SlavePools()
             var t2 = g.dameng.Ado.SlavePools.Count;
         }
 
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.dameng.Ado.ExecuteConnectTest());
+        }
         [Fact]
         public void ExecuteReader()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Default/OdbcAdo/OdbcAdoTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Default/OdbcAdo/OdbcAdoTest.cs
@@ -19,6 +19,11 @@ public void SlavePools()
             var t2 = g.odbc.Ado.SlavePools.Count;
         }
 
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.odbc.Ado.ExecuteConnectTest());
+        }
         [Fact]
         public void ExecuteReader()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/KingbaseES/KingbaseESAdo/KingbaseESAdoTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/KingbaseES/KingbaseESAdo/KingbaseESAdoTest.cs
@@ -18,6 +18,11 @@ public void SlavePools()
             var t2 = g.kingbaseES.Ado.SlavePools.Count;
         }
 
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.kingbaseES.Ado.ExecuteConnectTest());
+        }
         [Fact]
         public void ExecuteReader()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/MySqlAdo/MySqlAdoTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/MySqlAdo/MySqlAdoTest.cs
@@ -19,6 +19,11 @@ public void SlavePools()
             var t2 = g.mysql.Ado.SlavePools.Count;
         }
 
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.mysql.Ado.ExecuteConnectTest());
+        }
         [Fact]
         public void ExecuteReader()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Oracle/OracleAdo/OracleAdoTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Oracle/OracleAdo/OracleAdoTest.cs
@@ -18,6 +18,11 @@ public void SlavePools()
             var t2 = g.oracle.Ado.SlavePools.Count;
         }
 
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.oracle.Ado.ExecuteConnectTest());
+        }
         [Fact]
         public void ExecuteReader()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/PostgreSQL/PostgreSQLAdo/PostgreSQLAdoTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/PostgreSQL/PostgreSQLAdo/PostgreSQLAdoTest.cs
@@ -18,6 +18,11 @@ public void SlavePools()
             var t2 = g.pgsql.Ado.SlavePools.Count;
         }
 
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.pgsql.Ado.ExecuteConnectTest());
+        }
         [Fact]
         public void ExecuteReader()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/SqlServer/SqlServerAdo/SqlServerAdoTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/SqlServer/SqlServerAdo/SqlServerAdoTest.cs
@@ -20,6 +20,11 @@ public void SlavePools()
             var t2 = g.sqlserver.Ado.SlavePools.Count;
         }
 
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.sqlserver.Ado.ExecuteConnectTest());
+        }
         [Fact]
         public void ExecuteReader()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/Dameng/DamengAdo/DamengAdoTest.cs b/FreeSql.Tests/FreeSql.Tests/Dameng/DamengAdo/DamengAdoTest.cs
@@ -18,6 +18,11 @@ public void SlavePools()
             var t2 = g.dameng.Ado.SlavePools.Count;
         }
 
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.dameng.Ado.ExecuteConnectTest());
+        }
         [Fact]
         public void ExecuteReader()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/MsAccess/MsAccessAdo/MsAccessAdoTest.cs b/FreeSql.Tests/FreeSql.Tests/MsAccess/MsAccessAdo/MsAccessAdoTest.cs
@@ -17,6 +17,12 @@ public void SlavePools()
         {
             var t2 = g.msaccess.Ado.SlavePools.Count;
         }
+
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.msaccess.Ado.ExecuteConnectTest());
+        }
         [Fact]
         public void ExecuteReader()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/MySql/MySqlAdo/MySqlAdoTest.cs b/FreeSql.Tests/FreeSql.Tests/MySql/MySqlAdo/MySqlAdoTest.cs
@@ -18,6 +18,11 @@ public void SlavePools()
             var t2 = g.mysql.Ado.SlavePools.Count;
         }
 
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.mysql.Ado.ExecuteConnectTest());
+        }
         [Fact]
         public void ExecuteReader()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/Oracle/OracleAdo/OracleAdoTest.cs b/FreeSql.Tests/FreeSql.Tests/Oracle/OracleAdo/OracleAdoTest.cs
@@ -18,6 +18,11 @@ public void SlavePools()
             var t2 = g.oracle.Ado.SlavePools.Count;
         }
 
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.oracle.Ado.ExecuteConnectTest());
+        }
         [Fact]
         public void ExecuteReader()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLAdo/PostgreSQLAdoTest.cs b/FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLAdo/PostgreSQLAdoTest.cs
@@ -18,6 +18,11 @@ public void SlavePools()
             var t2 = g.pgsql.Ado.SlavePools.Count;
         }
 
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.pgsql.Ado.ExecuteConnectTest());
+        }
         [Fact]
         public void ExecuteReader()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/ShenTong/ShenTongAdo/ShenTongAdoTest.cs b/FreeSql.Tests/FreeSql.Tests/ShenTong/ShenTongAdo/ShenTongAdoTest.cs
@@ -18,6 +18,11 @@ public void SlavePools()
             var t2 = g.shentong.Ado.SlavePools.Count;
         }
 
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.shentong.Ado.ExecuteConnectTest());
+        }
         [Fact]
         public void ExecuteReader()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerAdo/SqlServerAdoTest.cs b/FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerAdo/SqlServerAdoTest.cs
@@ -29,6 +29,11 @@ public void SlavePools()
             var t2 = g.sqlserver.Ado.SlavePools.Count;
         }
 
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.sqlserver.Ado.ExecuteConnectTest());
+        }
         [Fact]
         public void ExecuteReader()
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/Sqlite/SqliteAdo/SqliteAdoTest.cs b/FreeSql.Tests/FreeSql.Tests/Sqlite/SqliteAdo/SqliteAdoTest.cs
@@ -17,6 +17,12 @@ public void SlavePools()
         {
             var t2 = g.sqlite.Ado.SlavePools.Count;
         }
+
+        [Fact]
+        public void ExecuteTest()
+        {
+            Assert.True(g.sqlite.Ado.ExecuteConnectTest());
+        }
         [Fact]
         public void ExecuteReader()
         {
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
diff --git a/FreeSql/Interface/IAdo.cs b/FreeSql/Interface/IAdo.cs
@@ -62,6 +62,14 @@ public partial interface IAdo
         /// <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 @@ public partial interface IAdo
 #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>
diff --git a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs
@@ -95,6 +95,27 @@ internal Dictionary<string, PropertyInfo> GetQueryTypeProperties(Type type)
             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));
diff --git a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs
@@ -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));

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,11 @@ public void SlavePools()`
`18`	`18`	`var t2 = g.mysql.Ado.SlavePools.Count;`
`19`	`19`	`}`
`20`	`20`
	`21`	`+ [Fact]`
	`22`	`+ public void ExecuteTest()`
	`23`	`+ {`
	`24`	`+ Assert.True(g.mysql.Ado.ExecuteConnectTest());`
	`25`	`+ }`
`21`	`26`	`[Fact]`
`22`	`27`	`public void ExecuteReader()`
`23`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,11 @@ public void SlavePools()`
`19`	`19`	`var t2 = g.odbc.Ado.SlavePools.Count;`
`20`	`20`	`}`
`21`	`21`
	`22`	`+ [Fact]`
	`23`	`+ public void ExecuteTest()`
	`24`	`+ {`
	`25`	`+ Assert.True(g.odbc.Ado.ExecuteConnectTest());`
	`26`	`+ }`
`22`	`27`	`[Fact]`
`23`	`28`	`public void ExecuteReader()`
`24`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,11 @@ public void SlavePools()`
`20`	`20`	`var t2 = g.sqlserver.Ado.SlavePools.Count;`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ [Fact]`
	`24`	`+ public void ExecuteTest()`
	`25`	`+ {`
	`26`	`+ Assert.True(g.sqlserver.Ado.ExecuteConnectTest());`
	`27`	`+ }`
`23`	`28`	`[Fact]`
`24`	`29`	`public void ExecuteReader()`
`25`	`30`	`{`