Corrected connection string

Author: “llt”

frameworks/CSharp/appmpower/src/appMpower.Orm/Data/DbConnection.cs

@@ -54,12 +54,12 @@ private void GetConnection()
          if (_keyed)
          {
             (_number, _dbConnection, _keyedDbCommands) = 
-               DbConnectionsKeyed.GetConnectionBase(_connectionString);
+               DbConnectionsKeyed.GetConnectionBase();
          }
          else
          {
             (_number, _dbConnection, _dbCommands) =
-               DbConnections.GetConnectionBase(_connectionString);
+               DbConnections.GetConnectionBase();
          }
       }
 

frameworks/CSharp/appmpower/src/appMpower.Orm/Data/DbConnections.cs

@@ -8,19 +8,15 @@ internal static class DbConnections
 
       private static ConcurrentStack<(int Number, System.Data.Common.DbConnection DbConnection, ConcurrentStack<System.Data.Common.DbCommand> DbCommands)> _connectionsStack = new();
 
-      internal static (int Number, System.Data.Common.DbConnection DbConnection, ConcurrentStack<System.Data.Common.DbCommand> DbCommands) GetConnectionBase(string connectionString)
+      internal static (int Number, System.Data.Common.DbConnection DbConnection, ConcurrentStack<System.Data.Common.DbCommand> DbCommands) GetConnectionBase()
       {
          (int Number, System.Data.Common.DbConnection DbConnection, ConcurrentStack<System.Data.Common.DbCommand> DbCommands) dbConnectionBase;
 
          if (!_connectionsStack.TryPop(out dbConnectionBase))
          {
             _createdConnections++;
-
-            System.Data.Common.DbConnection dbConnection = DbFactory.Instance.CreateConnection();
-            dbConnection.ConnectionString = connectionString; 
-
             dbConnectionBase = (Number: _createdConnections, 
-                                DbConnection: dbConnection, 
+                                DbConnection: DbFactory.GetConnection(), 
                                 DbCommands: new ConcurrentStack<System.Data.Common.DbCommand>());
          }
 

frameworks/CSharp/appmpower/src/appMpower.Orm/Data/DbConnectionsKeyed.cs

@@ -9,18 +9,15 @@ internal static class DbConnectionsKeyed
 
       private static ConcurrentStack<(int Number, System.Data.Common.DbConnection DbConnection, Dictionary<string, System.Data.Common.DbCommand>)> _connectionsStack = new();
 
-      internal static (int Number, System.Data.Common.DbConnection DbConnection, Dictionary<string, System.Data.Common.DbCommand> KeyedDbCommands) GetConnectionBase(string connectionString)
+      internal static (int Number, System.Data.Common.DbConnection DbConnection, Dictionary<string, System.Data.Common.DbCommand> KeyedDbCommands) GetConnectionBase()
       {
          (int Number, System.Data.Common.DbConnection DbConnection, Dictionary<string, System.Data.Common.DbCommand> KeyedDbCommands) dbConnectionBase;
 
          if (!_connectionsStack.TryPop(out dbConnectionBase))
          {
             _createdConnections++;
-            using System.Data.Common.DbConnection dbConnection = DbFactory.Instance.CreateConnection();
-            dbConnection.ConnectionString = connectionString; 
-
             dbConnectionBase = (Number: _createdConnections, 
-                                DbConnection: dbConnection, 
+                                DbConnection: DbFactory.GetConnection(), 
                                 KeyedDbCommands: new Dictionary<string, System.Data.Common.DbCommand>());
          }
 

frameworks/CSharp/appmpower/src/appMpower.Orm/Data/DbFactory.cs

@@ -8,11 +8,23 @@ public static class DbFactory
       public static string ConnectionString; 
 
 #if ADO
+   #if MYSQL
       public static DbProviderFactory Instance = MySqlConnector.MySqlConnectorFactory.Instance;
+   #else
+      public static DbProviderFactory Instance = Npgsql.NpgsqlFactory.Instance; 
+   #endif 
 #else
       public static DbProviderFactory Instance = System.Data.Odbc.OdbcFactory.Instance;
 #endif
 
+      public static System.Data.Common.DbConnection GetConnection()
+      {
+          System.Data.Common.DbConnection dbConnection = Instance.CreateConnection();
+          dbConnection.ConnectionString = ConnectionString;
+
+          return dbConnection; 
+      }
+
       public static void SetConnectionString()
       {
          if (Constants.Dbms == Dbms.MySQL)
@@ -27,7 +39,13 @@ public static void SetConnectionString()
          }
          else
          {
+#if ADO
+            ConnectionString = "Server=tfb-database;Database=hello_world;User Id=benchmarkdbuser;Password=benchmarkdbpass;Maximum Pool Size=1024;NoResetOnClose=true;Enlist=false;Max Auto Prepare=3";
+            Console.WriteLine("hey ado postgresql");
+#else
             ConnectionString = "Driver={PostgreSQL};Server=tfb-database;Database=hello_world;Uid=benchmarkdbuser;Pwd=benchmarkdbpass;UseServerSidePrepare=1;Pooling=false;sslmode=disable";
+            Console.WriteLine("hey odbc postgresql");
+#endif
          }
       }
    }