eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Pgsql::Connection::connect functions now all report connection errors

Browse source 
by throwing exception.
This commit is contained in:
eelke 2019-11-03 07:58:48 +01:00
parent 05bca069e3
commit c5f6da48ce
5 changed files with 35 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pglab/CrudModel.cpp
View file

@ -434,7 +434,7 @@ std::tuple<bool, CrudModel::ModifiedRow> CrudModel::updateRow(const PendingRow &
int row_number = pending_row.row();
Pgsql::Connection db_update_conn;
auto dbconfig = m_database->config();
db_update_conn.connect(dbconfig.connectionString().toStdString().c_str());
db_update_conn.connect(dbconfig.connectionString());
try {
auto result = db_update_conn.queryParam(buffer, params);
if (result && result.rows() == 1) {
@ -528,7 +528,7 @@ std::tuple<bool, QString> CrudModel::removeRows(const std::set<IntegerRange<int>
try {
Pgsql::Connection db_update_conn;
auto dbconfig = m_database->config();
db_update_conn.connect(dbconfig.connectionString().toStdString().c_str());
db_update_conn.connect(dbconfig.connectionString());
// First delete rows in table
QString delete_statement = createDeleteStatement();

10
pglab/OpenDatabase.cpp
View file

@ -48,11 +48,7 @@ TypeSelectionItemModel* OpenDatabase::typeSelectionModel()
void OpenDatabase::refresh()
{
Pgsql::Connection conn;
std::string connstr = m_config.connectionString().toStdString();
if (conn.connect(connstr.c_str())) {
m_catalog->loadAll(conn, nullptr);
}
else {
qDebug() << "Connect failed connstr: " << connstr.c_str();
}
auto connstr = m_config.connectionString();
conn.connect(connstr);
m_catalog->loadAll(conn, nullptr);
}