EditColumnTableModel, return typename for displayrole for type column and oid for edit value.

This commit is contained in:
eelke 2018-12-16 09:35:57 +01:00
parent 44358d198a
commit 387c664284
3 changed files with 22 additions and 8 deletions

View file

@ -1,7 +1,10 @@
#include "EditColumnTableModel.h"
#include "PgDatabaseCatalog.h"
#include "PgTypeContainer.h"
EditColumnTableModel::EditColumnTableModel(QObject *parent)
EditColumnTableModel::EditColumnTableModel(std::shared_ptr<PgDatabaseCatalog> catalog, QObject *parent)
: QAbstractTableModel(parent)
, m_catalog(catalog)
{
m_data.push_back({});
}
@ -44,7 +47,16 @@ QVariant EditColumnTableModel::data(const QModelIndex &index, int role) const
if (role == Qt::EditRole || role == Qt::DisplayRole) {
switch (index.column()) {
case NameCol: return d.name;
case TypeCol: return d.type;
case TypeCol:
if (role == Qt::DisplayRole) {
if (d.type != InvalidOid) {
auto&& t = m_catalog->types()->getByKey(d.type);
return t->objectName();
}
return QString();
}
else
return d.type;
case LengthCol: return d.length;
case ScaleCol: return d.scale;
case CollateCol: return d.collate;
@ -70,14 +82,14 @@ bool EditColumnTableModel::setData(const QModelIndex &index, const QVariant &val
{
size_t rij = static_cast<size_t>(index.row());
auto && d = m_data.at(rij);
if (role == Qt::EditRole || role == Qt::DisplayRole) {
if (role == Qt::EditRole) {
const int col = index.column();
if (col == NameCol) {
d.name = value.toString();
return true;
}
else if (col == TypeCol) {
d.type = value.toInt();
d.type = value.toUInt();
return true;
}
else if (col == LengthCol) {
@ -89,7 +101,7 @@ bool EditColumnTableModel::setData(const QModelIndex &index, const QVariant &val
return true;
}
else if (col == CollateCol) {
d.collate = value.toInt();
d.collate = value.toUInt();
return true;
}
else if (col == NotNullCol) {