PostgreSQL Connection String issue fixed (#4500)

Co-authored-by: Mayur Rathi <mayurrat@amdocs.com>

Author: rathimayur

Ginger/GingerCoreNET/Database/DatabaseOperations.cs

@@ -417,25 +417,35 @@ public Boolean Connect(bool displayErrorPopup = false)
                         break;
 
                     case eDBTypes.PostgreSQL:
-                        string postgreSQLHost = TNSCalculated;
-                        int? port = null;
-                        if (TNSCalculated.Contains(':', StringComparison.Ordinal))
+                        var pg = new NpgsqlConnectionStringBuilder();
+                        if (string.IsNullOrEmpty(ConnectionStringCalculated))
                         {
-                            var parts = TNSCalculated.Split(':', 2);
-                            postgreSQLHost = parts[0];
-                            if (int.TryParse(parts[1], out int p)) port = p;
-                        }
-                        ValidateHostPort(postgreSQLHost, port);
+                            string postgreSQLHost = TNSCalculated;
+                            int? port = null;
+                            if (TNSCalculated.Contains(':', StringComparison.Ordinal))
+                            {
+                                var parts = TNSCalculated.Split(':', 2);
+                                postgreSQLHost = parts[0];
+                                if (int.TryParse(parts[1], out int p)) port = p;
+                            }
+                            ValidateHostPort(postgreSQLHost, port);
 
-                        var pg = new NpgsqlConnectionStringBuilder
+                            pg = new NpgsqlConnectionStringBuilder
+                            {
+                                Host = postgreSQLHost,
+                                Database = Database.Name ?? string.Empty,
+                                Username = UserCalculated,
+                                Password = EncryptionHandler.DecryptwithKey(PassCalculated)
+                            };
+                            if (port.HasValue) pg.Port = port.Value;
+                        }
+                        else
                         {
-                            Host = postgreSQLHost,
-                            Database = Database.Name ?? string.Empty,
-                            Username = UserCalculated,
-                            Password = EncryptionHandler.DecryptwithKey(PassCalculated)
-                        };
-                        if (port.HasValue) pg.Port = port.Value;
-                        Database.ConnectionString = pg.ConnectionString;
+                            pg = new NpgsqlConnectionStringBuilder
+                            {
+                                ConnectionString = GetConnectionString()
+                            };
+                        }
 
                         oConn = new NpgsqlConnection(pg.ConnectionString);
                         oConn.Open();
@@ -1045,4 +1055,4 @@ public string GetRecordCount(string SQL)
         }
 
     }
-}
+}