Reorganize files in pglablib

The enitities and containers of the catalog now go into catalog subfolder
Models go into model
This commit is contained in:
eelke 2018-12-16 10:17:59 +01:00
parent 56cbeea183
commit f0c1035378
121 changed files with 226 additions and 183 deletions

View file

@ -1,6 +1,7 @@
#include "EditColumnTableModel.h"
#include "PgDatabaseCatalog.h"
#include "PgTypeContainer.h"
#include "catalog/PgDatabaseCatalog.h"
#include "catalog/PgTypeContainer.h"
#include "catalog/PgCollationContainer.h"
EditColumnTableModel::EditColumnTableModel(std::shared_ptr<PgDatabaseCatalog> catalog, QObject *parent)
: QAbstractTableModel(parent)
@ -51,7 +52,7 @@ QVariant EditColumnTableModel::data(const QModelIndex &index, int role) const
if (role == Qt::DisplayRole) {
if (d.type != InvalidOid) {
auto&& t = m_catalog->types()->getByKey(d.type);
return t->objectName();
return t ? t->objectName() : QString();
}
return QString();
}
@ -59,7 +60,16 @@ QVariant EditColumnTableModel::data(const QModelIndex &index, int role) const
return d.type;
case LengthCol: return d.length;
case ScaleCol: return d.scale;
case CollateCol: return d.collate;
case CollateCol:
if (role == Qt::DisplayRole) {
if (d.collate != InvalidOid) {
auto&& c = m_catalog->collations()->getByKey(d.collate);
return c ? c->objectName() : QString();
}
return QString();
}
else
return d.collate;
case NotNullCol: return d.notNull;
case DefaultCol: return d.def;
case PrimaryKeyCol: return d.primaryKey;