github-starred/pgadmin3
2
0
Fork 0
mirror of https://github.com/levinsv/pgadmin3.git synced 2026-05-15 06:05:49 -06:00
Code Issues 6 Projects Packages Wiki Activity Actions

Add extend options in connstr.

Browse source 
Для сервера можно добавить дополнительные параметры подключения.
В настройка сервера на закладке "Дополнительно" в поле "Connect str"
This commit is contained in:
lsv 2023-10-13 15:22:35 +05:00 • committed by lsv
parent e23903504e
commit 0093e3676c
12 changed files with 80 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

12
db/pgConn.cpp
View file

@ -50,7 +50,7 @@ static void pgNoticeProcessor(void *arg, const char *message)
}
pgConn::pgConn(const wxString &server, const wxString &service, const wxString &hostaddr, const wxString &database, const wxString &username, const wxString &password,
int port, const wxString &rolename, int sslmode, OID oid, const wxString &applicationname,
int port, const wxString &rolename, const wxString& addconnstr, int sslmode, OID oid, const wxString &applicationname,
const wxString &sslcert, const wxString &sslkey, const wxString &sslrootcert, const wxString &sslcrl,
const bool sslcompression) : m_cancelConn(NULL)
{
@ -64,6 +64,7 @@ pgConn::pgConn(const wxString &server, const wxString &service, const wxString &
save_password = password;
save_port = port;
save_rolename = rolename;
save_addconnstr = addconnstr;
save_sslmode = sslmode;
save_oid = oid;
save_applicationname = applicationname;
@ -122,7 +123,12 @@ pgConn::pgConn(const wxString &server, const wxString &service, const wxString &
connstr.Append(wxT(" port="));
connstr.Append(NumToStr((long)port));
}
if (!addconnstr.IsEmpty())
{
connstr.Append(wxT(" "));
connstr.Append(addconnstr);
}
if (libpqVersion > 7.3)
{
switch (sslmode)
@ -362,7 +368,7 @@ pgConn *pgConn::Duplicate(const wxString &_appName)
{
pgConn *res = new pgConn(wxString(save_server), wxString(save_service),
wxString(save_hostaddr), wxString(save_database), wxString(save_username),
wxString(save_password), save_port, save_rolename, save_sslmode, save_oid,
wxString(save_password), save_port, save_rolename, save_addconnstr, save_sslmode, save_oid,
_appName.IsEmpty() ? save_applicationname : _appName, save_sslcert, save_sslkey,
save_sslrootcert, save_sslcrl, save_sslcompression);