Most of functionality for connections in tree works now. Old list largely removed.
This commit is contained in:
eelke
parent
8840d3bcbb
commit
b3a98f6dc0
10 changed files with 399 additions and 158 deletions
|
|
@ -17,7 +17,7 @@ namespace {
|
|||
R"__(
|
||||
CREATE TABLE IF NOT EXISTS conngroup (
|
||||
conngroup_id INTEGER PRIMARY KEY,
|
||||
gname TEXT NOT NULL
|
||||
gname TEXT NOT NULL UNIQUE
|
||||
);)__";
|
||||
|
||||
const char * const q_create_table_connection =
|
||||
|
|
@ -39,6 +39,8 @@ CREATE TABLE IF NOT EXISTS connection (
|
|||
passwordstate INTEGER NOT NULL
|
||||
);)__";
|
||||
|
||||
|
||||
|
||||
const char * const q_insert_or_replace_into_connection =
|
||||
R"__(INSERT OR REPLACE INTO connection
|
||||
VALUES (:uuid, :name, :conngroup_id, :host, :hostaddr, :port, :user, :dbname,
|
||||
|
|
@ -61,7 +63,7 @@ R"__(INSERT OR REPLACE INTO connection
|
|||
return {true, {}};
|
||||
}
|
||||
|
||||
std::tuple<bool, QSqlError> SaveConnectionConfig(QSqlDatabase &db, const ConnectionConfig &cc, int conngroup_id)
|
||||
std::optional<QSqlError> SaveConnectionConfig(QSqlDatabase &db, const ConnectionConfig &cc, int conngroup_id)
|
||||
{
|
||||
QSqlQuery q(db);
|
||||
q.prepare(q_insert_or_replace_into_connection);
|
||||
|
|
@ -81,75 +83,74 @@ R"__(INSERT OR REPLACE INTO connection
|
|||
q.bindValue(":passwordstate", static_cast<int>(cc.passwordState()));
|
||||
|
||||
if (!q.exec()) {
|
||||
auto err = q.lastError();
|
||||
return { false, err };
|
||||
return q.lastError();
|
||||
}
|
||||
return {true, {}};
|
||||
return {};
|
||||
}
|
||||
|
||||
/** Saves a connection configuration.
|
||||
|
||||
Before calling this you may want to call beginGroup.
|
||||
*/
|
||||
void SaveConnectionConfig(QSettings &settings, const ConnectionConfig &cc)
|
||||
{
|
||||
settings.setValue("name", stdStrToQ(cc.name()));
|
||||
settings.setValue("host", stdStrToQ(cc.host()));
|
||||
settings.setValue("hostaddr", stdStrToQ(cc.hostAddr()));
|
||||
settings.setValue("port", cc.port());
|
||||
settings.setValue("user", stdStrToQ(cc.user()));
|
||||
//settings.setValue("password", stdStrToQ(cc.password()));
|
||||
settings.setValue("dbname", stdStrToQ(cc.dbname()));
|
||||
settings.setValue("sslmode", static_cast<int>(cc.sslMode()));
|
||||
settings.setValue("sslcert", stdStrToQ(cc.sslCert()));
|
||||
settings.setValue("sslkey", stdStrToQ(cc.sslKey()));
|
||||
settings.setValue("sslrootcert", stdStrToQ(cc.sslRootCert()));
|
||||
settings.setValue("sslcrl", stdStrToQ(cc.sslCrl()));
|
||||
settings.setValue("passwordState", static_cast<int>(cc.passwordState()));
|
||||
}
|
||||
// void SaveConnectionConfig(QSettings &settings, const ConnectionConfig &cc)
|
||||
// {
|
||||
// settings.setValue("name", stdStrToQ(cc.name()));
|
||||
// settings.setValue("host", stdStrToQ(cc.host()));
|
||||
// settings.setValue("hostaddr", stdStrToQ(cc.hostAddr()));
|
||||
// settings.setValue("port", cc.port());
|
||||
// settings.setValue("user", stdStrToQ(cc.user()));
|
||||
// //settings.setValue("password", stdStrToQ(cc.password()));
|
||||
// settings.setValue("dbname", stdStrToQ(cc.dbname()));
|
||||
// settings.setValue("sslmode", static_cast<int>(cc.sslMode()));
|
||||
// settings.setValue("sslcert", stdStrToQ(cc.sslCert()));
|
||||
// settings.setValue("sslkey", stdStrToQ(cc.sslKey()));
|
||||
// settings.setValue("sslrootcert", stdStrToQ(cc.sslRootCert()));
|
||||
// settings.setValue("sslcrl", stdStrToQ(cc.sslCrl()));
|
||||
// settings.setValue("passwordState", static_cast<int>(cc.passwordState()));
|
||||
// }
|
||||
|
||||
|
||||
|
||||
template <typename S, typename T>
|
||||
bool in_range(T value)
|
||||
{
|
||||
return value >= std::numeric_limits<S>::min() && value <= std::numeric_limits<S>::max();
|
||||
}
|
||||
// template <typename S, typename T>
|
||||
// bool in_range(T value)
|
||||
// {
|
||||
// return value >= std::numeric_limits<S>::min() && value <= std::numeric_limits<S>::max();
|
||||
// }
|
||||
|
||||
void LoadConnectionConfig(QSettings &settings, ConnectionConfig &cc)
|
||||
{
|
||||
cc.setName(qvarToStdStr(settings.value("name")));
|
||||
cc.setHost(qvarToStdStr(settings.value("host")));
|
||||
cc.setHostAddr(qvarToStdStr(settings.value("hostaddr")));
|
||||
int p = settings.value("port", 5432).toInt();
|
||||
if (!in_range<uint16_t>(p)) {
|
||||
p = 0; // let the user re-enter a valid value
|
||||
}
|
||||
// void LoadConnectionConfig(QSettings &settings, ConnectionConfig &cc)
|
||||
// {
|
||||
// cc.setName(qvarToStdStr(settings.value("name")));
|
||||
// cc.setHost(qvarToStdStr(settings.value("host")));
|
||||
// cc.setHostAddr(qvarToStdStr(settings.value("hostaddr")));
|
||||
// int p = settings.value("port", 5432).toInt();
|
||||
// if (!in_range<uint16_t>(p)) {
|
||||
// p = 0; // let the user re-enter a valid value
|
||||
// }
|
||||
|
||||
cc.setPort(static_cast<uint16_t>(p));
|
||||
cc.setUser(qvarToStdStr(settings.value("user")));
|
||||
// cc.setPort(static_cast<uint16_t>(p));
|
||||
// cc.setUser(qvarToStdStr(settings.value("user")));
|
||||
|
||||
//cc.setPassword(qvarToStdStr(settings.value("password")));
|
||||
// //cc.setPassword(qvarToStdStr(settings.value("password")));
|
||||
|
||||
cc.setDbname(qvarToStdStr(settings.value("dbname")));
|
||||
cc.setSslMode(static_cast<SslMode>(settings.value("sslmode").toInt()));
|
||||
cc.setSslCert(qvarToStdStr(settings.value("sslcert")));
|
||||
cc.setSslKey(qvarToStdStr(settings.value("sslkey")));
|
||||
cc.setSslRootCert(qvarToStdStr(settings.value("sslrootcert")));
|
||||
cc.setSslCrl(qvarToStdStr(settings.value("sslcrl")));
|
||||
// cc.setDbname(qvarToStdStr(settings.value("dbname")));
|
||||
// cc.setSslMode(static_cast<SslMode>(settings.value("sslmode").toInt()));
|
||||
// cc.setSslCert(qvarToStdStr(settings.value("sslcert")));
|
||||
// cc.setSslKey(qvarToStdStr(settings.value("sslkey")));
|
||||
// cc.setSslRootCert(qvarToStdStr(settings.value("sslrootcert")));
|
||||
// cc.setSslCrl(qvarToStdStr(settings.value("sslcrl")));
|
||||
|
||||
PasswordState pwstate;
|
||||
QVariant v = settings.value("passwordState");
|
||||
if (v.isNull()) pwstate = PasswordState::NotStored;
|
||||
else pwstate = static_cast<PasswordState>(v.toInt());
|
||||
cc.setPasswordState(pwstate);
|
||||
}
|
||||
// PasswordState pwstate;
|
||||
// QVariant v = settings.value("passwordState");
|
||||
// if (v.isNull()) pwstate = PasswordState::NotStored;
|
||||
// else pwstate = static_cast<PasswordState>(v.toInt());
|
||||
// cc.setPasswordState(pwstate);
|
||||
// }
|
||||
|
||||
|
||||
} // end of unnamed namespace
|
||||
|
||||
|
||||
|
||||
#if false
|
||||
ConnectionListModel::ConnectionListModel(QObject *parent)
|
||||
: QAbstractListModel(parent)
|
||||
{
|
||||
|
|
@ -390,7 +391,7 @@ QString ConnectionListModel::iniFileName()
|
|||
path += "/connections.ini";
|
||||
return path;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
ConnectionTreeModel::ConnectionTreeModel(QObject *parent, QSqlDatabase &db)
|
||||
: QAbstractItemModel(parent)
|
||||
|
|
@ -402,26 +403,79 @@ void ConnectionTreeModel::load()
|
|||
{
|
||||
InitConnectionTables(m_db);
|
||||
|
||||
auto g1 = std::make_shared<ConnectionGroup>();
|
||||
g1->name = "Testing";
|
||||
QSqlQuery q(m_db);
|
||||
q.prepare("SELECT conngroup_id, gname FROM conngroup;");
|
||||
if (!q.exec()) {
|
||||
// auto err = q_create_table.lastError();
|
||||
// return { false, err };
|
||||
throw std::runtime_error("Loading groups failed");
|
||||
}
|
||||
while (q.next()) {
|
||||
int id = q.value(0).toInt();
|
||||
QString name = q.value(1).toString();
|
||||
|
||||
for (int i = 1; i < 3; ++i) {
|
||||
auto cc = std::make_shared<ConnectionConfig>();
|
||||
cc->setUuid(QUuid::createUuid());
|
||||
cc->setName("testconn " + std::to_string(i));
|
||||
g1->add(cc);
|
||||
auto g = std::make_shared<ConnectionGroup>();
|
||||
g->conngroup_id = id;
|
||||
g->name = name;
|
||||
m_groups.push_back(g);
|
||||
}
|
||||
|
||||
auto g2 = std::make_shared<ConnectionGroup>();
|
||||
g2->name = "Production";
|
||||
for (int i = 1; i < 4; ++i) {
|
||||
q.prepare("SELECT uuid, cname, conngroup_id, host, hostaddr, port, "
|
||||
" user, dbname, sslmode, sslcert, sslkey, sslrootcert, sslcrl, "
|
||||
" passwordstate "
|
||||
"FROM connection ORDER BY conngroup_id, cname;");
|
||||
if (!q.exec()) {
|
||||
// auto err = q_create_table.lastError();
|
||||
// return { false, err };
|
||||
throw std::runtime_error("Loading groups failed");
|
||||
}
|
||||
while (q.next()) {
|
||||
auto cc = std::make_shared<ConnectionConfig>();
|
||||
cc->setUuid(QUuid::createUuid());
|
||||
cc->setName("prodconn " + std::to_string(i));
|
||||
g2->add(cc);
|
||||
cc->setUuid(q.value(0).toUuid());
|
||||
cc->setName(qvarToStdStr(q.value(1)));
|
||||
cc->setHost(qvarToStdStr(q.value(3)));
|
||||
cc->setHostAddr(qvarToStdStr(q.value(4)));
|
||||
cc->setPort(static_cast<uint16_t>(q.value(5).toInt()));
|
||||
cc->setUser(qvarToStdStr(q.value(6)));
|
||||
cc->setDbname(qvarToStdStr(q.value(7)));
|
||||
cc->setSslMode(static_cast<SslMode>(q.value(8).toInt()));
|
||||
cc->setSslCert(qvarToStdStr(q.value(9)));
|
||||
cc->setSslKey(qvarToStdStr(q.value(10)));
|
||||
cc->setSslRootCert(qvarToStdStr(q.value(11)));
|
||||
cc->setSslCrl(qvarToStdStr(q.value(12)));
|
||||
cc->setPasswordState(static_cast<PasswordState>(q.value(13).toInt()));
|
||||
|
||||
int group_id = q.value(2).toInt();
|
||||
auto find_res = std::find_if(m_groups.begin(), m_groups.end(),
|
||||
[group_id] (auto item) { return item->conngroup_id == group_id; });
|
||||
if (find_res != m_groups.end()) {
|
||||
(*find_res)->add(cc);
|
||||
}
|
||||
else {
|
||||
throw std::runtime_error("conngroup missing");
|
||||
}
|
||||
}
|
||||
|
||||
m_groups = { g1, g2 };
|
||||
// auto g1 = std::make_shared<ConnectionGroup>();
|
||||
// g1->name = "Testing";
|
||||
|
||||
// for (int i = 1; i < 3; ++i) {
|
||||
// auto cc = std::make_shared<ConnectionConfig>();
|
||||
// cc->setUuid(QUuid::createUuid());
|
||||
// cc->setName("testconn " + std::to_string(i));
|
||||
// g1->add(cc);
|
||||
// }
|
||||
|
||||
// auto g2 = std::make_shared<ConnectionGroup>();
|
||||
// g2->name = "Production";
|
||||
// for (int i = 1; i < 4; ++i) {
|
||||
// auto cc = std::make_shared<ConnectionConfig>();
|
||||
// cc->setUuid(QUuid::createUuid());
|
||||
// cc->setName("prodconn " + std::to_string(i));
|
||||
// g2->add(cc);
|
||||
// }
|
||||
|
||||
// m_groups = { g1, g2 };
|
||||
}
|
||||
|
||||
QVariant ConnectionTreeModel::data(const QModelIndex &index, int role) const
|
||||
|
|
@ -517,7 +571,8 @@ QModelIndex ConnectionTreeModel::parent(const QModelIndex &index) const
|
|||
auto p = config->parent();
|
||||
auto find_res = std::find_if(m_groups.begin(), m_groups.end(), [p] (auto item) -> bool { return *p == *item; });
|
||||
if (find_res != m_groups.end()) {
|
||||
return createIndex(find_res - m_groups.begin(), 0, config->parent());
|
||||
return createIndex(find_res - m_groups.begin(), 0,
|
||||
const_cast<ConnectionGroup*>(config->parent()));
|
||||
}
|
||||
}
|
||||
throw std::logic_error("Should never get here");
|
||||
|
|
@ -547,7 +602,133 @@ int ConnectionTreeModel::rowCount(const QModelIndex &parent) const
|
|||
return result;
|
||||
}
|
||||
|
||||
int ConnectionTreeModel::columnCount(const QModelIndex &parent) const
|
||||
int ConnectionTreeModel::columnCount(const QModelIndex &) const
|
||||
{
|
||||
return ColCount;
|
||||
}
|
||||
|
||||
bool ConnectionTreeModel::removeRows(int row, int count, const QModelIndex &parent)
|
||||
{
|
||||
if (parent.isValid() && count == 1) {
|
||||
// should be a group
|
||||
auto grp = m_groups[parent.row()];
|
||||
for (int i = 0; i < count; ++i) {
|
||||
QUuid uuid = grp->connections().at(row + i)->uuid();
|
||||
QSqlQuery q(m_db);
|
||||
q.prepare(
|
||||
"DELETE FROM connection "
|
||||
" WHERE uuid=:uuid");
|
||||
q.bindValue(":uuid", uuid);
|
||||
if (!q.exec()) {
|
||||
auto err = q.lastError();
|
||||
throw std::runtime_error("QqlError");
|
||||
}
|
||||
}
|
||||
beginRemoveRows(parent, row, row + count - 1);
|
||||
SCOPE_EXIT { endRemoveRows(); };
|
||||
grp->erase(row, count);
|
||||
}
|
||||
}
|
||||
|
||||
void ConnectionTreeModel::save(const QString &group_name, const ConnectionConfig &cc)
|
||||
{
|
||||
auto [grp_idx, conn_idx] = findConfig(cc.uuid());
|
||||
if (grp_idx >= 0) {
|
||||
auto grp = m_groups[grp_idx];
|
||||
if (grp->name == group_name) {
|
||||
// update config
|
||||
grp->update(conn_idx, cc);
|
||||
// send change event
|
||||
auto node = grp->connections().at(conn_idx);
|
||||
dataChanged(
|
||||
createIndex(conn_idx, 0, node.get()),
|
||||
createIndex(conn_idx, ColCount-1, node.get()));
|
||||
saveToDb(*node);
|
||||
return;
|
||||
}
|
||||
else {
|
||||
auto parent = createIndex(grp_idx, 0, grp.get());
|
||||
beginRemoveRows(parent, conn_idx, conn_idx);
|
||||
SCOPE_EXIT { endRemoveRows(); };
|
||||
grp->erase(conn_idx);
|
||||
}
|
||||
}
|
||||
// Here we can assume we have to find the new group or create a new group
|
||||
// because if the connection was in the right group the function has already returned.
|
||||
// We assume the model is in sync with the DB as the DB should not be shared!
|
||||
int new_grp_idx = findGroup(group_name);
|
||||
if (new_grp_idx < 0) {
|
||||
// Group not found we are g
|
||||
auto add_grp_res = addGroup(group_name);
|
||||
if (std::holds_alternative<int>(add_grp_res)) {
|
||||
new_grp_idx = std::get<int>(add_grp_res);
|
||||
}
|
||||
else {
|
||||
throw std::runtime_error("SqlError1");
|
||||
}
|
||||
}
|
||||
auto new_grp = m_groups[new_grp_idx];
|
||||
|
||||
auto parent = createIndex(new_grp_idx, 0, new_grp.get());
|
||||
auto idx = new_grp->connections().size();
|
||||
beginInsertRows(parent, idx, idx);
|
||||
SCOPE_EXIT { endInsertRows(); };
|
||||
auto node = std::make_shared<ConnectionConfig>(cc);
|
||||
int node_idx = new_grp->add(node);
|
||||
// dataChanged(
|
||||
// createIndex(node_idx, 0, node.get()),
|
||||
// createIndex(node_idx, ColCount-1, node.get()));
|
||||
auto save_res = saveToDb(*node);
|
||||
if (save_res) {
|
||||
throw std::runtime_error("SqlError2");
|
||||
}
|
||||
}
|
||||
|
||||
void ConnectionTreeModel::save(const ConnectionConfig &cc)
|
||||
{
|
||||
saveToDb(cc);
|
||||
}
|
||||
|
||||
std::tuple<int, int> ConnectionTreeModel::findConfig(const QUuid uuid) const
|
||||
{
|
||||
int group_idx = -1, connection_idx = -1;
|
||||
|
||||
for (int grp_idx = 0; grp_idx < m_groups.size(); ++grp_idx) {
|
||||
auto && grp = m_groups[grp_idx];
|
||||
auto && conns = grp->connections();
|
||||
auto find_res = std::find_if(conns.begin(), conns.end(),
|
||||
[&uuid] (auto item) -> bool { return item->uuid() == uuid; });
|
||||
if (find_res != conns.end()) {
|
||||
group_idx = grp_idx;
|
||||
connection_idx = find_res - conns.begin();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return { group_idx, connection_idx };
|
||||
}
|
||||
|
||||
int ConnectionTreeModel::findGroup(QString name) const
|
||||
{
|
||||
for (int idx = 0; idx < m_groups.size(); ++idx) {
|
||||
if (m_groups[idx]->name == name) return idx;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
std::variant<int, QSqlError> ConnectionTreeModel::addGroup(QString group_name)
|
||||
{
|
||||
QSqlQuery q(m_db);
|
||||
q.prepare("INSERT INTO conngroup (gname) VALUES (:name)");
|
||||
q.bindValue(":name", group_name);
|
||||
if (!q.exec()) {
|
||||
auto err = q.lastError();
|
||||
return { err };
|
||||
}
|
||||
return q.lastInsertId().toInt();
|
||||
}
|
||||
|
||||
std::optional<QSqlError> ConnectionTreeModel::saveToDb(const ConnectionConfig &cc)
|
||||
{
|
||||
return SaveConnectionConfig(m_db, cc, cc.parent()->conngroup_id);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue