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

Improved connection error handling.

Browse source 
Just returning a boolean is too limiting. Using expection instead to easily pass on error message.
This commit is contained in:
eelke 2018-12-23 08:43:43 +01:00
parent 646b18ebeb
commit a88af1ac11
5 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

36
pglab/CrudModel.cpp
View file

@ -435,26 +435,23 @@ 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();
bool res = db_update_conn.connect(dbconfig.getKeywords(), dbconfig.getValues(), false);
if (res) {
auto result = db_update_conn.queryParam(buffer, params);
if (result && result.rows() == 1) {
db_update_conn.connect(dbconfig.getKeywords(), dbconfig.getValues(), false);
auto result = db_update_conn.queryParam(buffer, params);
if (result && result.rows() == 1) {
std::vector<Value> values;
auto row = *result.begin();
for (auto v : row) {
if (v.null())
values.push_back(Value());
else
values.push_back(std::string(v.c_str()));
}
ModifiedRow modified_row(row_number, values);
return { true, modified_row };
std::vector<Value> values;
auto row = *result.begin();
for (auto v : row) {
if (v.null())
values.push_back(Value());
else
values.push_back(std::string(v.c_str()));
}
}
ModifiedRow modified_row(row_number, values);
return { true, modified_row };
}
}
return { false, {} };
}
@ -527,10 +524,7 @@ std::tuple<bool, QString> CrudModel::removeRows(const std::set<IntegerRange<int>
try {
Pgsql::Connection db_update_conn;
auto dbconfig = m_database->config();
bool res = db_update_conn.connect(dbconfig.getKeywords(), dbconfig.getValues(), false);
if (!res) {
return { false, "Cannot connect to the database" };
}
db_update_conn.connect(dbconfig.getKeywords(), dbconfig.getValues(), false);
// First delete rows in table
QString delete_statement = createDeleteStatement();

28
pglab/OpenDatabase.cpp
View file

@ -5,15 +5,18 @@
Expected<OpenDatabase::OpenDatabaseSPtr> OpenDatabase::createOpenDatabase(const ConnectionConfig &cfg)
{
OpenDatabaseSPtr odb(new OpenDatabase(cfg));
if (odb->Init()) {
return Expected<OpenDatabase::OpenDatabaseSPtr>::fromCode(
[&cfg] () -> auto {
OpenDatabaseSPtr odb(new OpenDatabase(cfg));
odb->Init();
return odb;
});
// catch (const PgException &ex) {
// return
// }
return odb;
}
//return Expected<ConnectionConfig>::fromException(std::out_of_range("Invalid row"));
return Expected<OpenDatabaseSPtr>::fromException(
std::runtime_error("Failed to get database information"));
// return Expected<OpenDatabaseSPtr>::fromException(
// std::runtime_error("Failed to get database information"));
}
OpenDatabase::OpenDatabase(const ConnectionConfig& cfg)
@ -24,16 +27,13 @@ OpenDatabase::OpenDatabase(const ConnectionConfig& cfg)
OpenDatabase::~OpenDatabase() = default;
bool OpenDatabase::Init()
void OpenDatabase::Init()
{
Pgsql::Connection conn;
auto kw = m_config.getKeywords();
auto vals = m_config.getValues();
if (conn.connect(kw, vals, 0)) {
m_catalog->loadAll(conn, nullptr);
return true;
}
return false;
conn.connect(kw, vals, 0);
m_catalog->loadAll(conn, nullptr);
}
std::shared_ptr<PgDatabaseCatalog> OpenDatabase::catalog()

2
pglab/OpenDatabase.h
View file

@ -34,7 +34,7 @@ private:
TypeSelectionItemModel *m_typeSelectionModel = nullptr;
OpenDatabase(const ConnectionConfig& cfg);
bool Init();
void Init();
};
#endif // OPENDATABASE_H