From 1c2a89e53f93a6f6e51d2bbeb7d99f7e88134510 Mon Sep 17 00:00:00 2001
From: HCL <1625932291@qq.com>
Date: Wed, 28 Jun 2023 18:26:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=88=87=E6=8D=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MECF.Framework.Common/Aitex/Core/RT/DBCore/DB.cs            | 2 +-
 .../Aitex/Core/RT/DBCore/DatabaseManager.cs                 | 6 +++---
 MECF.Framework.Common/Aitex/Core/RT/DBCore/IDataBase.cs     | 2 +-
 .../Aitex/Core/RT/DBCore/IDataBaseManager.cs                | 2 +-
 .../Aitex/Core/RT/DBCore/PostgresqlHelper.cs                | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/MECF.Framework.Common/Aitex/Core/RT/DBCore/DB.cs b/MECF.Framework.Common/Aitex/Core/RT/DBCore/DB.cs
index 77840a9..206afc1 100644
--- a/MECF.Framework.Common/Aitex/Core/RT/DBCore/DB.cs
+++ b/MECF.Framework.Common/Aitex/Core/RT/DBCore/DB.cs
@@ -32,7 +32,7 @@ namespace Aitex.Core.RT.DBCore
             return Manager?.ExecuteReader(sql);
         }
 
-        public static object ExecuteScalar(string sql)
+        public static object ExecuteScalar(string sql, bool isChangeDB = true)
         {
             return Manager?.ExecuteScalar(sql);
         }
diff --git a/MECF.Framework.Common/Aitex/Core/RT/DBCore/DatabaseManager.cs b/MECF.Framework.Common/Aitex/Core/RT/DBCore/DatabaseManager.cs
index 55df743..50cc315 100644
--- a/MECF.Framework.Common/Aitex/Core/RT/DBCore/DatabaseManager.cs
+++ b/MECF.Framework.Common/Aitex/Core/RT/DBCore/DatabaseManager.cs
@@ -52,7 +52,7 @@ namespace Aitex.Core.RT.DBCore
         {
             try
             {
-                object obj = _dataBase.ExecuteScalar($"select datname from pg_catalog.pg_database where datname='{_dbName}'");
+                object obj = _dataBase.ExecuteScalar($"select datname from pg_catalog.pg_database where datname='{_dbName}'",false);
                 if (obj == null)
                 {
                     string cmdText = $"CREATE DATABASE {_dbName} WITH OWNER = postgres ENCODING = 'UTF8' TABLESPACE = pg_default CONNECTION LIMIT = -1";
@@ -313,9 +313,9 @@ namespace Aitex.Core.RT.DBCore
             return _dataBase.ExecuteNonQuery(sql, columnsName, args);
         }
 
-        public object ExecuteScalar(string sql)
+        public object ExecuteScalar(string sql, bool isChangeDB = true)
         {
-            return _dataBase.ExecuteScalar(sql);
+            return _dataBase.ExecuteScalar(sql, isChangeDB);
         }
 
         public DataSet ExecuteDataSet(string sql)
diff --git a/MECF.Framework.Common/Aitex/Core/RT/DBCore/IDataBase.cs b/MECF.Framework.Common/Aitex/Core/RT/DBCore/IDataBase.cs
index e53e96e..45c95b2 100644
--- a/MECF.Framework.Common/Aitex/Core/RT/DBCore/IDataBase.cs
+++ b/MECF.Framework.Common/Aitex/Core/RT/DBCore/IDataBase.cs
@@ -16,7 +16,7 @@ namespace Aitex.Core.RT.DBCore
 
         public DbDataReader ExecuteReader(string sql);
 
-        public object ExecuteScalar(string sql);
+        public object ExecuteScalar(string sql, bool isChangeDB = true);
 
         public DataSet ExecuteDataSet(string sql);
 
diff --git a/MECF.Framework.Common/Aitex/Core/RT/DBCore/IDataBaseManager.cs b/MECF.Framework.Common/Aitex/Core/RT/DBCore/IDataBaseManager.cs
index 9a3caa5..0e997eb 100644
--- a/MECF.Framework.Common/Aitex/Core/RT/DBCore/IDataBaseManager.cs
+++ b/MECF.Framework.Common/Aitex/Core/RT/DBCore/IDataBaseManager.cs
@@ -18,7 +18,7 @@ namespace Aitex.Core.RT.DBCore
 
         public int ExecuteNonQuery(string sql, string[] columnsName, params object[] args);
 
-        public object ExecuteScalar(string sql);
+        public object ExecuteScalar(string sql, bool isChangeDB = true);
 
         public DataSet ExecuteDataSet(string sql);
 
diff --git a/MECF.Framework.Common/Aitex/Core/RT/DBCore/PostgresqlHelper.cs b/MECF.Framework.Common/Aitex/Core/RT/DBCore/PostgresqlHelper.cs
index c475b28..422b138 100644
--- a/MECF.Framework.Common/Aitex/Core/RT/DBCore/PostgresqlHelper.cs
+++ b/MECF.Framework.Common/Aitex/Core/RT/DBCore/PostgresqlHelper.cs
@@ -154,7 +154,7 @@ namespace Aitex.Core.RT.DBCore
         /// <param name="sql"></param>
         /// <param name="args"></param>
         /// <returns></returns>
-        public object ExecuteScalar(string sql)
+        public object ExecuteScalar(string sql, bool isChangeDB = true)
         {
             using (NpgsqlConnection conn = new NpgsqlConnection(_connString))
             {
@@ -164,7 +164,7 @@ namespace Aitex.Core.RT.DBCore
 
                     try
                     {
-                        PrepareCommand(cmd, conn, sql);
+                        PrepareCommand(cmd, conn, sql, isChangeDB);
                         obj = cmd.ExecuteScalar();
                     }
                     catch (Exception ex)