Skip to content

add support for connections via service #2001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jef-n wants to merge 1 commit into
base: develop
Choose a base branch
from
+345 −289
Open

add support for connections via service #2001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 15 additions & 12 deletions libs/libconnector/src/connection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ bool Connection::ignore_db_version {false};

const QString Connection::ParamAlias {"alias"};
const QString Connection::ParamApplicationName {"application_name"};
const QString Connection::ParamService {"service"};
const QString Connection::ParamServerFqdn {"host"};
const QString Connection::ParamServerIp {"hostaddr"};
const QString Connection::ParamPort {"port"};
Expand Down Expand Up @@ -158,11 +159,6 @@ void Connection::generateConnectionString()
connection_str += value;
}
}

if(!connection_str.contains(ParamDbName) ||
(!connection_str.contains(ParamServerFqdn) &&
!connection_str.contains(ParamServerIp)))
connection_str.clear();
}

void Connection::noticeProcessor(void *, const char *message)
Expand All @@ -186,8 +182,10 @@ void Connection::validateConnectionStatus()

if(PQstatus(connection)==CONNECTION_BAD)
throw Exception(Exception::getErrorMessage(ErrorCode::ConnectionBroken)
.arg(connection_params[ParamServerFqdn].isEmpty() ? connection_params[ParamServerIp] : connection_params[ParamServerFqdn])
.arg(connection_params[ParamPort]),
.arg(connection_params[ParamService].isEmpty()
? QString(QT_TR_NOOP("`%1` at port `%2`")).arg(connection_params[ParamServerFqdn].isEmpty() ? connection_params[ParamServerIp] : connection_params[ParamServerFqdn], connection_params[ParamPort])
: QString(QT_TR_NOOP("server %1")).arg(connection_params[ParamService])
),
ErrorCode::ConnectionBroken, __PRETTY_FUNCTION__, __FILE__, __LINE__);
}

Expand Down Expand Up @@ -349,13 +347,18 @@ QString Connection::getConnectionId(bool host_port_only, bool incl_db_name, bool
if(!isConfigured())
return "";

if(!connection_params[ParamServerFqdn].isEmpty())
addr=connection_params[ParamServerFqdn];
if(!connection_params[ParamService].isEmpty())
addr = connection_params[ParamService];
else
addr=connection_params[ParamServerIp];
{
if(!connection_params[ParamServerFqdn].isEmpty())
addr=connection_params[ParamServerFqdn];
else
addr=connection_params[ParamServerIp];

if(!connection_params[ParamPort].isEmpty())
port = QString(":%1").arg(connection_params[ParamPort]);
if(!connection_params[ParamPort].isEmpty())
port = QString(":%1").arg(connection_params[ParamPort]);
}

if(incl_db_name)
db_name = QString("%1@").arg(connection_params[ParamDbName]);
Expand Down
1 change: 1 addition & 0 deletions libs/libconnector/src/connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ class __libconnector Connection {
//! \brief Constants used to reference the connections parameters
static const QString ParamAlias,
ParamApplicationName,
ParamService,
ParamServerFqdn,
ParamServerIp,
ParamPort,
Expand Down
24 changes: 16 additions & 8 deletions libs/libgui/src/settings/connectionsconfigwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ ConnectionsConfigWidget::ConnectionsConfigWidget(QWidget * parent) : BaseConfigW
connect(add_tb, &QPushButton::clicked, this, __slot(this, ConnectionsConfigWidget::handleConnection));

connect(alias_edt, &QLineEdit::textChanged, this, &ConnectionsConfigWidget::enableConnectionTest);
connect(service_edt, &QLineEdit::textChanged, this, &ConnectionsConfigWidget::enableConnectionTest);
connect(host_edt, &QLineEdit::textChanged, this, &ConnectionsConfigWidget::enableConnectionTest);
connect(user_edt, &QLineEdit::textChanged, this, &ConnectionsConfigWidget::enableConnectionTest);
connect(passwd_edt, &QLineEdit::textChanged, this, &ConnectionsConfigWidget::enableConnectionTest);
Expand All @@ -67,6 +68,7 @@ void ConnectionsConfigWidget::hideEvent(QHideEvent *event)
{
newConnection();
one_time_conn_edit = false;
service_edt->setEnabled(true);
host_edt->setEnabled(true);
port_sbp->setEnabled(true);
conn_btns_wgt->setVisible(true);
Expand Down Expand Up @@ -160,14 +162,16 @@ void ConnectionsConfigWidget::loadConfiguration()
}
}

void ConnectionsConfigWidget::setOneTimeEditMode(bool one_time_edit, const QString &conn_alias, const QString &dbname, const QString &host, int port, const QString &username, const QString &password)
void ConnectionsConfigWidget::setOneTimeEditMode(bool one_time_edit, const QString &conn_alias, const QString &service, const QString &host, int port, const QString &dbname, const QString &username, const QString &password)
{
one_time_conn_edit = one_time_edit;
conn_btns_wgt->setVisible(!one_time_edit);
add_tb->setVisible(!one_time_edit);
service_edt->setDisabled(one_time_edit && !service.isEmpty());
host_edt->setDisabled(one_time_edit && !host.isEmpty());
port_sbp->setDisabled(one_time_edit && port > 0);
alias_edt->setText(conn_alias);
service_edt->setText(service);
conn_db_edt->setText(dbname);
host_edt->setText(host);
port_sbp->setValue(port);
Expand All @@ -189,10 +193,7 @@ void ConnectionsConfigWidget::enableCertificates()

void ConnectionsConfigWidget::enableConnectionTest()
{
test_tb->setEnabled(!alias_edt->text().isEmpty() &&
!host_edt->text().isEmpty() &&
!user_edt->text().isEmpty() &&
!conn_db_edt->text().isEmpty());
test_tb->setEnabled(!alias_edt->text().isEmpty());
add_tb->setEnabled(test_tb->isEnabled());
update_tb->setEnabled(test_tb->isEnabled());

Expand All @@ -211,6 +212,7 @@ void ConnectionsConfigWidget::newConnection()
conn_db_edt->clear();
alias_edt->clear();
user_edt->clear();
service_edt->clear();
host_edt->clear();
port_sbp->setValue(5432);
passwd_edt->clear();
Expand Down Expand Up @@ -336,6 +338,8 @@ void ConnectionsConfigWidget::editConnection()
import_chk->setChecked(conn->isDefaultForOperation(Connection::OpImport));
validation_chk->setChecked(conn->isDefaultForOperation(Connection::OpValidation));

service_edt->setText(conn->getConnectionParam(Connection::ParamService));

if(!conn->getConnectionParam(Connection::ParamServerFqdn).isEmpty())
host_edt->setText(conn->getConnectionParam(Connection::ParamServerFqdn));
else
Expand Down Expand Up @@ -400,6 +404,7 @@ void ConnectionsConfigWidget::configureConnection(Connection *conn, bool is_upda
}

conn->setConnectionParam(Connection::ParamAlias, alias);
conn->setConnectionParam(Connection::ParamService, service_edt->text());
conn->setConnectionParam(Connection::ParamServerIp, "");
conn->setConnectionParam(Connection::ParamServerFqdn, host_edt->text());
conn->setConnectionParam(Connection::ParamPort, QString("%1").arg(port_sbp->value()));
Expand Down Expand Up @@ -630,8 +635,11 @@ void ConnectionsConfigWidget::fillConnectionsComboBox(QComboBox *combo, bool inc
}

bool ConnectionsConfigWidget::openConnectionsConfiguration(bool one_time_edit,
const QString &conn_alias, const QString &dbname, const QString &host,
int port, const QString &username, const QString &password)
const QString &conn_alias,
const QString &service,
const QString &host, int port,
const QString &dbname,
const QString &username, const QString &password)
{
BaseForm parent_form;
ConnectionsConfigWidget conn_cfg_wgt;
Expand All @@ -656,7 +664,7 @@ bool ConnectionsConfigWidget::openConnectionsConfiguration(bool one_time_edit,
)
});

conn_cfg_wgt.setOneTimeEditMode(one_time_edit, conn_alias, dbname, host, port, username, password);
conn_cfg_wgt.setOneTimeEditMode(one_time_edit, conn_alias, service, host, port, dbname, username, password);
parent_form.setWindowTitle(tr("Edit database connections"));
parent_form.setWindowFlags(Qt::Dialog | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint);
parent_form.setMainWidget(&conn_cfg_wgt);
Expand Down
8 changes: 6 additions & 2 deletions libs/libgui/src/settings/connectionsconfigwidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@ class __libgui ConnectionsConfigWidget: public BaseConfigWidget, public Ui::Conn
* for them. Once the user accepts or rejects the editions the form
* returns to the original operation mode */
void setOneTimeEditMode(bool one_time_edit,
const QString &conn_alias, const QString &dbname,
const QString &conn_alias,
const QString &service,
const QString &host, int port,
const QString &dbname,
const QString &username, const QString &password);

static std::map<QString, attribs_map> getConfigurationParams();
Expand Down Expand Up @@ -96,8 +98,10 @@ class __libgui ConnectionsConfigWidget: public BaseConfigWidget, public Ui::Conn
* Returns true when the connection were changed somehow, either by restoring the defaults, adding new connections
* or removing current ones. Default values for connection alias, dbname, host, port and user can be provided. */
static bool openConnectionsConfiguration(bool one_time_edit = false,
const QString &conn_alias = "", const QString &dbname = "",
const QString &conn_alias = "",
const QString &service= "",
const QString &host = "", int port = 5432,
const QString &dbname = "",
const QString &username = "", const QString &password = "");

//! \brief Returns the first connection found which is defined as the default for the specified operation
Expand Down
Loading