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

In the list of columns displayed for a table a set of columns is appended describing the indexes on the table.

Browse source
This commit is contained in:
eelke 2017-12-17 19:34:28 +01:00
parent aef9b914b1
commit 172e2bcd1d
9 changed files with 95 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pglab/ASyncDBConnection.cpp
View file

@ -128,7 +128,7 @@ bool ASyncDBConnection::send(const std::string &command, Pgsql::Params params, o
return true;
}
void ASyncDBConnection::async_query_handler(boost::system::error_code ec, std::size_t s, on_result_callback on_result)
void ASyncDBConnection::async_query_handler(boost::system::error_code ec, std::size_t /*s*/, on_result_callback on_result)
{
if (ec == boost::system::errc::success) {
bool finished = false;

2
pglab/BackupDialog.cpp
View file

@ -248,7 +248,7 @@ void BackupDialog::on_btnStart_clicked()
p->start(program, arguments);
}
void BackupDialog::on_backupFormat_currentIndexChanged(int index)
void BackupDialog::on_backupFormat_currentIndexChanged(int /*index*/)
{
int format_index = ui->backupFormat->currentIndex();
auto format_model_base = ui->backupFormat->model();

108
pglab/ColumnTableModel.cpp
View file

@ -4,6 +4,7 @@
#include "PgAttributeContainer.h"
#include "PgType.h"
#include "PgTypeContainer.h"
#include "PgIndexContainer.h"
#include "ScopeGuard.h"
#include <QBrush>
@ -23,6 +24,14 @@ void ColumnTableModel::setData(std::shared_ptr<const PgDatabaseCatalog> cat, Oid
// 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);
std::sort(m_indexes.begin(), m_indexes.end(),
[] (const auto &l, const auto &r) -> bool
{
return l.isprimary > r.isprimary
|| (l.isprimary == r.isprimary && l.indexrelid < r.indexrelid);
});
}
QVariant ColumnTableModel::headerData(int section, Qt::Orientation orientation, int role) const
@ -31,22 +40,33 @@ QVariant ColumnTableModel::headerData(int section, Qt::Orientation orientation,
if (orientation == Qt::Horizontal) {
if (role == Qt::DisplayRole) {
QString c;
switch (section) {
case NameCol:
c = tr("Name");
break;
case TypeCol:
c = tr("Type");
break;
case NullCol:
c = tr("Nullable");
break;
case DefaultCol:
c = tr("Default");
break;
case CollationCol:
c = tr("Collation");
break;
if (section >= colCount) {
const auto &tbl_idx = m_indexes[section - colCount];
if (tbl_idx.isprimary)
c = "Pri";
else if (tbl_idx.isunique)
c = "Unq";
else
c = "Idx";
}
else {
switch (section) {
case NameCol:
c = tr("Name");
break;
case TypeCol:
c = tr("Type");
break;
case NullCol:
c = tr("Nullable");
break;
case DefaultCol:
c = tr("Default");
break;
case CollationCol:
c = tr("Collation");
break;
}
}
v = c;
}
@ -62,7 +82,7 @@ int ColumnTableModel::rowCount(const QModelIndex &/*parent*/) const
int ColumnTableModel::columnCount(const QModelIndex &/*parent*/) const
{
return colCount;
return colCount + m_indexes.size();
}
Oid ColumnTableModel::getType(int /*column*/) const
@ -86,26 +106,42 @@ Oid ColumnTableModel::getType(int /*column*/) const
QVariant ColumnTableModel::getData(const QModelIndex &index) const
{
QVariant v;
const auto &t = m_columns[index.row()];
QString s;
switch (index.column()) {
case NameCol:
s = t.name;
break;
case TypeCol:
s = getTypeDisplayString(*m_catalog, t.typid);
break;
case NullCol:
s = t.notnull ? "NOT NULL" : "";
break;
case DefaultCol:
s = "";
break;
case CollationCol:
s = ""; //t.collation;
break;
const int row = index.row();
const auto &t = m_columns[row];
const int col = index.column();
if (col >= colCount) {
const auto &tbl_idx = m_indexes[col - colCount];
int i = 1;
for (auto attr : tbl_idx.key) {
if (attr == t.num) {
v = i;
break;
}
++i;
}
}
else {
QString s;
switch (col) {
case NameCol:
s = t.name;
break;
case TypeCol:
s = getTypeDisplayString(*m_catalog, t.typid);
break;
case NullCol:
s = t.notnull ? "NOT NULL" : "";
break;
case DefaultCol:
s = "";
break;
case CollationCol:
s = ""; //t.collation;
break;
}
v = s;
}
v = s;
return v;
}

3
pglab/ColumnTableModel.h
View file

@ -2,7 +2,9 @@
#define COLUMNTABLEMODEL_H
#include "BaseTableModel.h"
#include "PgIndex.h"
#include <memory>
#include <vector>
class PgDatabaseCatalog;
class PgAttribute;
@ -38,6 +40,7 @@ protected:
std::shared_ptr<const PgDatabaseCatalog> m_catalog;
t_Columns m_columns;
std::vector<PgIndex> m_indexes;
};

2
pglab/ConnectionManagerWindow.cpp
View file

@ -166,7 +166,7 @@ void ConnectionManagerWindow::on_testButton_clicked()
QMessageBox::information(this, "pglab",
QString::fromUtf8(s.c_str()), QMessageBox::Yes);
}
catch (Botan::Decoding_Error &e) {
catch (Botan::Decoding_Error &/*e*/) {
QMessageBox::information(this, "pglab",
tr("Failure to decrypt"), QMessageBox::Yes);

4
pglab/ParamTypeDelegate.cpp
View file

@ -15,8 +15,8 @@ void ParamTypeDelegate::setTypeSelectionModel(TypeSelectionItemModel* model)
}
QWidget *ParamTypeDelegate::createEditor(QWidget *parent,
const QStyleOptionViewItem &option,
const QModelIndex &index) const
const QStyleOptionViewItem &/*option*/,
const QModelIndex &/*index*/) const
{
QWidget *w = nullptr;

1
pglab/PgIndex.h
View file

@ -27,6 +27,7 @@ public:
std::vector<int16_t> option;
QString exprs;
QString pred;
QString definition;
PgIndex();

15
pglab/PgIndexContainer.cpp
View file

@ -8,7 +8,8 @@ std::string PgIndexContainer::getLoadQuery() const
SELECT indexrelid, indrelid, indnatts, indisunique, indisprimary,
indisexclusion, indimmediate, indisclustered, indisvalid,
indcheckxmin, indisready, indislive, indisreplident, indkey,
indcollation, indclass, indoption, indexprs, indpred
indcollation, indclass, indoption, indexprs, indpred,
pg_get_indexdef(indexrelid)
FROM pg_index)__";
}
@ -23,6 +24,16 @@ PgIndex PgIndexContainer::loadElem(const Pgsql::Row &row)
col.getAsVector<Oid>(std::back_inserter(v.collation));
col.getAsVector<Oid>(std::back_inserter(v.indclass));
col.getAsVector<int16_t>(std::back_inserter(v.option));
col >> v.exprs >> v.pred;
col >> v.exprs >> v.pred >> v.definition;
return v;
}
std::vector<PgIndex> PgIndexContainer::getIndexesForTable(Oid table_oid) const
{
std::vector<PgIndex> result;
for (const auto &e : m_container)
if (e.relid == table_oid)
result.push_back(e);
return result;
}

1
pglab/PgIndexContainer.h
View file

@ -11,6 +11,7 @@ public:
using PgContainer<PgIndex>::PgContainer;
virtual std::string getLoadQuery() const override;
std::vector<PgIndex> getIndexesForTable(Oid table_oid) const;
protected:
virtual PgIndex loadElem(const Pgsql::Row &row) override;
};