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 -5
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit fa46971930 - Show all commits

16
pglab/IndexModel.cpp
View file

@ -6,14 +6,22 @@
#include "CustomDataRole.h" #include "CustomDataRole.h"
void IndexModel::setData(std::shared_ptr<const PgDatabaseCatalog> cat, const std::optional<PgClass> &table) void IndexModel::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, &IndexModel::refresh);
}
m_table = table;
refresh();
}
void IndexModel::refresh()
{ {
beginResetModel(); beginResetModel();
SCOPE_EXIT { endResetModel(); }; SCOPE_EXIT { endResetModel(); };
m_catalog = cat; if (m_table)
m_table = table; m_indexes = m_catalog->indexes()->getIndexesForTable(m_table->oid());
if (table)
m_indexes = cat->indexes()->getIndexesForTable(table->oid());
else else
m_indexes.clear(); m_indexes.clear();
} }

4
pglab/IndexModel.h
View file

@ -57,6 +57,10 @@ private:
using t_Indexes = std::vector<PgIndex>; using t_Indexes = std::vector<PgIndex>;
t_Indexes m_indexes; t_Indexes m_indexes;
QMetaObject::Connection refreshConnection;
private slots:
void refresh();
}; };
#endif // INDEXMODEL_H #endif // INDEXMODEL_H

2
pglab/widgets/CatalogIndexPage.cpp
View file

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