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

The oid column is now shown for tables that are "with oids".

Browse source
This commit is contained in:
eelke 2017-12-17 19:54:23 +01:00
parent 172e2bcd1d
commit 7051ef2efc
5 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
pglab/ColumnTableModel.cpp
View file

@ -8,24 +8,29 @@
#include "ScopeGuard.h"
#include <QBrush>
void ColumnTableModel::setData(std::shared_ptr<const PgDatabaseCatalog> cat, Oid table_oid)
void ColumnTableModel::setData(std::shared_ptr<const PgDatabaseCatalog> cat, const PgClass &table)
{
beginResetModel();
SCOPE_EXIT { endResetModel(); };
m_table = table;
m_catalog = cat;
m_columns = cat->attributes()->getColumnsForRelation(table_oid);
m_columns = cat->attributes()->getColumnsForRelation(table.oid);
// hide system columns
m_columns.erase(std::remove_if(m_columns.begin(), m_columns.end(),
[](auto &e) { return e.num <= 0; } ),
m_columns.end());
auto si = table.hasoids
? std::remove_if(m_columns.begin(), m_columns.end(),
[](PgAttribute &e) { return e.num <= 0 && e.name != "oid"; })
: std::remove_if(m_columns.begin(), m_columns.end(),
[](PgAttribute &e) { return e.num <= 0; });
// move columns to end and remove them
m_columns.erase(si, m_columns.end());
// sort remaining columns by order in table
std::sort(m_columns.begin(), m_columns.end(),
[] (auto &l, auto &r) -> bool { return l.num < r.num; });
m_indexes = m_catalog->indexes()->getIndexesForTable(table_oid);
m_indexes = m_catalog->indexes()->getIndexesForTable(table.oid);
std::sort(m_indexes.begin(), m_indexes.end(),
[] (const auto &l, const auto &r) -> bool
{

4
pglab/ColumnTableModel.h
View file

@ -2,6 +2,7 @@
#define COLUMNTABLEMODEL_H
#include "BaseTableModel.h"
#include "PgClass.h"
#include "PgIndex.h"
#include <memory>
#include <vector>
@ -22,7 +23,7 @@ public:
using BaseTableModel::BaseTableModel;
void setData(std::shared_ptr<const PgDatabaseCatalog> cat, Oid table_oid);
void setData(std::shared_ptr<const PgDatabaseCatalog> cat, const PgClass &table);
// Header:
QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
@ -39,6 +40,7 @@ protected:
using t_Columns = std::vector<PgAttribute>;
std::shared_ptr<const PgDatabaseCatalog> m_catalog;
PgClass m_table;
t_Columns m_columns;
std::vector<PgIndex> m_indexes;

4
pglab/TablesPage.cpp
View file

@ -39,7 +39,7 @@ void TablesPage::setCatalog(std::shared_ptr<PgDatabaseCatalog> cat)
void TablesPage::on_tableListTable_currentRowChanged(const QModelIndex &current, const QModelIndex &previous)
{
if (current.row() != previous.row()) {
Oid table_oid = m_tablesModel->getTableOid(current.row());
m_columnsModel->setData(m_catalog, table_oid);
PgClass table = m_tablesModel->getTable(current.row());
m_columnsModel->setData(m_catalog, table);
}
}

5
pglab/TablesTableModel.cpp
View file

@ -123,6 +123,11 @@ QVariant TablesTableModel::getData(const QModelIndex &index) const
return v;
}
PgClass TablesTableModel::getTable(int row) const
{
return m_tables[row];
}
Oid TablesTableModel::getTableOid(int row) const
{
return m_tables[row].oid;

2
pglab/TablesTableModel.h
View file

@ -2,6 +2,7 @@
#define TABLESTABLEMODEL_H
#include "BaseTableModel.h"
#include "PgClass.h"
#include <memory>
#include <vector>
@ -32,6 +33,7 @@ public:
int columnCount(const QModelIndex &parent) const override;
virtual QVariant data(const QModelIndex &index, int role) const override;
PgClass getTable(int row) const;
Oid getTableOid(int row) const;
protected:
virtual Oid getType(int column) const override;