Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 27 additions & 17 deletions Ginger/GingerCoreNET/Database/DatabaseOperations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
};
Comment thread
rathimayur marked this conversation as resolved.
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();
Expand Down Expand Up @@ -1045,4 +1055,4 @@ public string GetRecordCount(string SQL)
}

}
}
}
Loading