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

Resolve "reload catalog" #84

Merged
eelke merged 7 commits from 64-reload-catalog into master 2019-10-09 17:48:53 +00:00
Conversation 2 Commits 7 Files changed 26 +17 -10
3 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 23899b6bb6 - Show all commits

21
pglab/ConstraintModel.cpp
View file

@ -9,18 +9,23 @@ ConstraintModel::ConstraintModel(QObject *parent)
{ {
} }
void ConstraintModel::setData(std::shared_ptr<const PgDatabaseCatalog> cat, const std::optional<PgClass> &table) void ConstraintModel::setData(std::shared_ptr<const PgDatabaseCatalog> cat, const std::optional<PgClass> &table)
{
if (cat != m_catalog) {
m_catalog = cat;
refreshConnection = connect(m_catalog.get(), &PgDatabaseCatalog::refreshed, this, &ConstraintModel::refresh);
}
m_table = table;
refresh();
}
void ConstraintModel::refresh()
{ {
beginResetModel(); beginResetModel();
SCOPE_EXIT { endResetModel(); }; SCOPE_EXIT { endResetModel(); };
m_table = table; if (m_table) {
m_catalog = cat; m_constraints = m_catalog->constraints()->getConstraintsForRelation(m_table->oid());
if (table) {
m_constraints = cat->constraints()->getConstraintsForRelation(table->oid());
std::sort(m_constraints.begin(), m_constraints.end(), std::sort(m_constraints.begin(), m_constraints.end(),
[] (auto &l, auto &r) { [] (auto &l, auto &r) {
return l.type < r.type || return l.type < r.type ||
@ -116,8 +121,6 @@ QString IconForConstraintType(ConstraintType ct)
return s; return s;
} }
QVariant ConstraintModel::getData(const QModelIndex &index) const QVariant ConstraintModel::getData(const QModelIndex &index) const
{ {
QVariant v; QVariant v;

4
pglab/ConstraintModel.h
View file

@ -48,6 +48,10 @@ private:
using t_Constraints = std::vector<PgConstraint>; using t_Constraints = std::vector<PgConstraint>;
t_Constraints m_constraints; t_Constraints m_constraints;
QMetaObject::Connection refreshConnection;
private slots:
void refresh();
}; };
#endif // CONSTRAINTMODEL_H #endif // CONSTRAINTMODEL_H

2
pglab/widgets/CatalogConstraintPage.cpp
View file

@ -16,6 +16,7 @@ CatalogConstraintPage::CatalogConstraintPage(QWidget *parent)
connect(m_tableView->selectionModel(), &QItemSelectionModel::selectionChanged, connect(m_tableView->selectionModel(), &QItemSelectionModel::selectionChanged,
this, &CatalogConstraintPage::tableView_selectionChanged); this, &CatalogConstraintPage::tableView_selectionChanged);
connect(m_constraintModel, &ConstraintModel::modelReset, m_definitionView, &SqlCodePreview::clear);
} }
void CatalogConstraintPage::catalogSet() void CatalogConstraintPage::catalogSet()
@ -26,7 +27,6 @@ void CatalogConstraintPage::setFilter(const std::optional<PgClass> &cls)
{ {
m_constraintModel->setData(m_catalog, cls); m_constraintModel->setData(m_catalog, cls);
m_tableView->resizeColumnsToContents(); m_tableView->resizeColumnsToContents();
m_definitionView->setPlainText({});
} }
void CatalogConstraintPage::tableView_selectionChanged(const QItemSelection &/*selected*/, const QItemSelection &/*deselected*/) void CatalogConstraintPage::tableView_selectionChanged(const QItemSelection &/*selected*/, const QItemSelection &/*deselected*/)