优化数据库连接字符串属性，修复当using使用后连接字符串被置为空无法再次使用BUG；

zqlovejyc · May 13, 2019 · 2a49f25 · 2a49f25
1 parent 775a44d
commit 2a49f25
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 0 deletions.
diff --git a/SQLBuilder.Core/Extensions.cs b/SQLBuilder.Core/Extensions.cs
@@ -312,6 +312,30 @@ public static bool IsNull(this object @this)
         }
         #endregion
 
+        #region IsNullOrEmpty
+        /// <summary>
+        /// 判断字符串是否为空
+        /// </summary>
+        /// <param name="this">待验证的字符串</param>
+        /// <returns>bool</returns>
+        public static bool IsNullOrEmpty(this string @this)
+        {
+            return string.IsNullOrEmpty(@this);
+        }
+        #endregion
+
+        #region IsNullOrWhiteSpace
+        /// <summary>
+        /// 判断字符串是否为空
+        /// </summary>
+        /// <param name="this">待验证的字符串</param>
+        /// <returns>bool</returns>
+        public static bool IsNullOrWhiteSpace(this string @this)
+        {
+            return string.IsNullOrWhiteSpace(@this);
+        }
+        #endregion
+
         #region ToSafeValue
         /// <summary>
         /// 转换为安全类型的值

diff --git a/SQLBuilder.Core/Repositories/MySqlRepository.cs b/SQLBuilder.Core/Repositories/MySqlRepository.cs
@@ -70,6 +70,11 @@ public DbConnection Connection
                     if (_dbConnection.State != ConnectionState.Open)
                         _dbConnection.Open();
                 }
+                //DbConnection被using后连接字符串被置为空
+                else if (_dbConnection.ConnectionString.IsNullOrEmpty())
+                {
+                    _dbConnection.ConnectionString = ConnectionString;
+                }
                 return _dbConnection;
             }
             set

diff --git a/SQLBuilder.Core/Repositories/NpgsqlRepository.cs b/SQLBuilder.Core/Repositories/NpgsqlRepository.cs
@@ -70,6 +70,11 @@ public DbConnection Connection
                     if (_dbConnection.State != ConnectionState.Open)
                         _dbConnection.Open();
                 }
+                //DbConnection被using后连接字符串被置为空
+                else if (_dbConnection.ConnectionString.IsNullOrEmpty())
+                {
+                    _dbConnection.ConnectionString = ConnectionString;
+                }
                 return _dbConnection;
             }
             set

diff --git a/SQLBuilder.Core/Repositories/OracleRepository.cs b/SQLBuilder.Core/Repositories/OracleRepository.cs
@@ -70,6 +70,11 @@ public DbConnection Connection
                     if (_dbConnection.State != ConnectionState.Open)
                         _dbConnection.Open();
                 }
+                //DbConnection被using后连接字符串被置为空
+                else if (_dbConnection.ConnectionString.IsNullOrEmpty())
+                {
+                    _dbConnection.ConnectionString = ConnectionString;
+                }
                 return _dbConnection;
             }
             set

diff --git a/SQLBuilder.Core/Repositories/SqlRepository.cs b/SQLBuilder.Core/Repositories/SqlRepository.cs
@@ -70,6 +70,11 @@ public DbConnection Connection
                     if (_dbConnection.State != ConnectionState.Open)
                         _dbConnection.Open();
                 }
+                //DbConnection被using后连接字符串被置为空
+                else if (_dbConnection.ConnectionString.IsNullOrEmpty())
+                {
+                    _dbConnection.ConnectionString = ConnectionString;
+                }
                 return _dbConnection;
             }
             set

diff --git a/SQLBuilder.Core/Repositories/SqliteRepository.cs b/SQLBuilder.Core/Repositories/SqliteRepository.cs
@@ -70,6 +70,11 @@ public DbConnection Connection
                     if (_dbConnection.State != ConnectionState.Open)
                         _dbConnection.Open();
                 }
+                //DbConnection被using后连接字符串被置为空
+                else if (_dbConnection.ConnectionString.IsNullOrEmpty())
+                {
+                    _dbConnection.ConnectionString = ConnectionString;
+                }
                 return _dbConnection;
             }
             set