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

@ -2,7 +2,7 @@
#include "ResultTableModelUtil.h" #include "ResultTableModelUtil.h"
#include "UserConfiguration.h" #include "UserConfiguration.h"
#include <QTableView> #include <QTableView>
#include "PgClass.h" #include "catalog/PgClass.h"
#include "SqlCodePreview.h" #include "SqlCodePreview.h"
#include "ColumnTableModel.h" #include "ColumnTableModel.h"
#include "CustomFilterSortModel.h" #include "CustomFilterSortModel.h"

View file

@ -1,7 +1,7 @@
#ifndef COLUMNPAGE_H #ifndef COLUMNPAGE_H
#define COLUMNPAGE_H #define COLUMNPAGE_H
#include "PgClass.h" #include "catalog/PgClass.h"
#include <QSplitter> #include <QSplitter>
#include <memory> #include <memory>
#include <optional> #include <optional>

View file

@ -1,14 +1,14 @@
#include "ColumnTableModel.h" #include "ColumnTableModel.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
#include "PgAttribute.h" #include "catalog/PgAttribute.h"
#include "PgAttributeContainer.h" #include "catalog/PgAttributeContainer.h"
#include "PgClassContainer.h" #include "catalog/PgClassContainer.h"
#include "PgConstraintContainer.h" #include "catalog/PgConstraintContainer.h"
#include "PgCollation.h" #include "catalog/PgCollation.h"
#include "PgCollationContainer.h" #include "catalog/PgCollationContainer.h"
#include "PgType.h" #include "catalog/PgType.h"
#include "PgTypeContainer.h" #include "catalog/PgTypeContainer.h"
#include "PgIndexContainer.h" #include "catalog/PgIndexContainer.h"
#include "ScopeGuard.h" #include "ScopeGuard.h"
#include "SqlFormattingUtils.h" #include "SqlFormattingUtils.h"
#include <QBrush> #include <QBrush>

View file

@ -2,9 +2,9 @@
#define COLUMNTABLEMODEL_H #define COLUMNTABLEMODEL_H
#include "BaseTableModel.h" #include "BaseTableModel.h"
#include "PgAttribute.h" #include "catalog/PgAttribute.h"
#include "PgClass.h" #include "catalog/PgClass.h"
#include "PgIndex.h" #include "catalog/PgIndex.h"
#include <memory> #include <memory>
#include <optional> #include <optional>
#include <vector> #include <vector>

View file

@ -1,7 +1,7 @@
#include "ConstraintModel.h" #include "ConstraintModel.h"
#include "ScopeGuard.h" #include "ScopeGuard.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
#include "PgConstraintContainer.h" #include "catalog/PgConstraintContainer.h"
#include "Pgsql_oids.h" #include "Pgsql_oids.h"
ConstraintModel::ConstraintModel(QObject *parent) ConstraintModel::ConstraintModel(QObject *parent)

View file

@ -2,8 +2,8 @@
#define CONSTRAINTMODEL_H #define CONSTRAINTMODEL_H
#include "BaseTableModel.h" #include "BaseTableModel.h"
#include "PgClass.h" #include "catalog/PgClass.h"
#include "PgConstraint.h" #include "catalog/PgConstraint.h"
#include <QAbstractTableModel> #include <QAbstractTableModel>
#include <optional> #include <optional>
#include <vector> #include <vector>

View file

@ -1,10 +1,10 @@
#include "CrudModel.h" #include "CrudModel.h"
#include "ASyncWindow.h" #include "ASyncWindow.h"
#include "OpenDatabase.h" #include "OpenDatabase.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
#include "PgAttribute.h" #include "catalog/PgAttribute.h"
#include "PgAttributeContainer.h" #include "catalog/PgAttributeContainer.h"
#include "PgConstraintContainer.h" #include "catalog/PgConstraintContainer.h"
#include "GlobalIoService.h" #include "GlobalIoService.h"
#include "SqlFormattingUtils.h" #include "SqlFormattingUtils.h"
#include "WorkManager.h" #include "WorkManager.h"

View file

@ -6,8 +6,8 @@
#include "Pgsql_Connection.h" #include "Pgsql_Connection.h"
#include "IntegerRange.h" #include "IntegerRange.h"
#include "PgClass.h" #include "catalog/PgClass.h"
#include "PgConstraint.h" #include "catalog/PgConstraint.h"
#include "Pgsql_Connection.h" #include "Pgsql_Connection.h"
#include <map> #include <map>
#include <memory> #include <memory>

View file

@ -1,7 +1,7 @@
#ifndef CRUDTAB_H #ifndef CRUDTAB_H
#define CRUDTAB_H #define CRUDTAB_H
#include "PgClass.h" #include "catalog/PgClass.h"
#include <QWidget> #include <QWidget>
#include "PlgPage.h" #include "PlgPage.h"
#include <memory> #include <memory>

View file

@ -1,7 +1,7 @@
#include "DatabasesTableModel.h" #include "DatabasesTableModel.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
#include "PgDatabaseContainer.h" #include "catalog/PgDatabaseContainer.h"
#include "PgAuthIdContainer.h" #include "catalog/PgAuthIdContainer.h"
#include "ResultTableModelUtil.h" #include "ResultTableModelUtil.h"
using namespace Pgsql; using namespace Pgsql;

View file

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

View file

@ -4,9 +4,9 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QTableView> #include <QTableView>
#include "OpenDatabase.h" #include "OpenDatabase.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
#include "SelectionEditorFactory.h" #include "SelectionEditorFactory.h"
#include "TypeModelFactory.h" #include "model/TypeModelFactory.h"
EditTableWidget::EditTableWidget(std::shared_ptr<OpenDatabase> database, QWidget *parent) EditTableWidget::EditTableWidget(std::shared_ptr<OpenDatabase> database, QWidget *parent)
: QWidget(parent) : QWidget(parent)

View file

@ -1,6 +1,6 @@
#include "IndexModel.h" #include "IndexModel.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
#include "PgIndexContainer.h" #include "catalog/PgIndexContainer.h"
#include "Pgsql_oids.h" #include "Pgsql_oids.h"
#include "ScopeGuard.h" #include "ScopeGuard.h"
#include "CustomDataRole.h" #include "CustomDataRole.h"

View file

@ -2,8 +2,8 @@
#define INDEXMODEL_H #define INDEXMODEL_H
#include <QAbstractTableModel> #include <QAbstractTableModel>
#include "PgClass.h" #include "catalog/PgClass.h"
#include "PgIndex.h" #include "catalog/PgIndex.h"
#include <memory> #include <memory>
#include <optional> #include <optional>
#include <vector> #include <vector>

View file

@ -1,6 +1,6 @@
#include "NamespaceItemModel.h" #include "NamespaceItemModel.h"
#include "PgNamespace.h" #include "catalog/PgNamespace.h"
#include "PgNamespaceContainer.h" #include "catalog/PgNamespaceContainer.h"
#include "ScopeGuard.h" #include "ScopeGuard.h"
namespace NamespaceItemModel_impl { namespace NamespaceItemModel_impl {

View file

@ -2,7 +2,7 @@
#define NAMESPACEITEMMODEL_H #define NAMESPACEITEMMODEL_H
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include "PgNamespace.h" #include "catalog/PgNamespace.h"
#include <vector> #include <vector>
#include <iterator> #include <iterator>

View file

@ -1,7 +1,7 @@
#include "OpenDatabase.h" #include "OpenDatabase.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
#include "Pgsql_Connection.h" #include "Pgsql_Connection.h"
#include "TypeSelectionItemModel.h" #include "model/TypeSelectionItemModel.h"
Expected<OpenDatabase::OpenDatabaseSPtr> OpenDatabase::createOpenDatabase(const ConnectionConfig &cfg) Expected<OpenDatabase::OpenDatabaseSPtr> OpenDatabase::createOpenDatabase(const ConnectionConfig &cfg)
{ {

View file

@ -1,7 +1,7 @@
#include "ParamTypeDelegate.h" #include "ParamTypeDelegate.h"
#include <QComboBox> #include <QComboBox>
#include "TypeSelectionItemModel.h" #include "model/TypeSelectionItemModel.h"
ParamTypeDelegate::ParamTypeDelegate() ParamTypeDelegate::ParamTypeDelegate()
{} {}

View file

@ -1,6 +1,6 @@
#include "ProcTableModel.h" #include "ProcTableModel.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
#include "PgProcContainer.h" #include "catalog/PgProcContainer.h"
#include "CustomDataRole.h" #include "CustomDataRole.h"
ProcTableModel::ProcTableModel(QObject *parent) ProcTableModel::ProcTableModel(QObject *parent)

View file

@ -2,8 +2,8 @@
#define PROCTABLEMODEL_H #define PROCTABLEMODEL_H
#include <QAbstractTableModel> #include <QAbstractTableModel>
#include "PgClass.h" #include "catalog/PgClass.h"
#include "PgProc.h" #include "catalog/PgProc.h"
#include <memory> #include <memory>
class PgDatabaseCatalog; class PgDatabaseCatalog;

View file

@ -1,7 +1,7 @@
#include "QueryParamListController.h" #include "QueryParamListController.h"
#include "OpenDatabase.h" #include "OpenDatabase.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
#include "PgTypeContainer.h" #include "catalog/PgTypeContainer.h"
#include <QTableView> #include <QTableView>

View file

@ -2,7 +2,7 @@
#include "ResultTableModelUtil.h" #include "ResultTableModelUtil.h"
#include "Pgsql_declare.h" #include "Pgsql_declare.h"
#include "Pgsql_oids.h" #include "Pgsql_oids.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
#include <QBrush> #include <QBrush>
#include <QColor> #include <QColor>

View file

@ -17,7 +17,7 @@
#include "json/json.h" #include "json/json.h"
#include "MainWindow.h" #include "MainWindow.h"
#include "OpenDatabase.h" #include "OpenDatabase.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
#include "QueryParamListController.h" #include "QueryParamListController.h"
#include "util.h" #include "util.h"
#include "GlobalIoService.h" #include "GlobalIoService.h"

View file

@ -1,5 +1,5 @@
#include "RolesTableModel.h" #include "RolesTableModel.h"
#include "PgAuthIdContainer.h" #include "catalog/PgAuthIdContainer.h"
RolesTableModel::RolesTableModel(QObject *parent) RolesTableModel::RolesTableModel(QObject *parent)
: BaseTableModel(parent) : BaseTableModel(parent)

View file

@ -1,9 +1,9 @@
#include "ServerWindow.h" #include "ServerWindow.h"
#include "ui_ServerWindow.h" #include "ui_ServerWindow.h"
#include "OpenDatabase.h" #include "OpenDatabase.h"
#include "DatabasesTableModel.h" #include "DatabasesTableModel.h"
#include "RolesTableModel.h" #include "RolesTableModel.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
ServerWindow::ServerWindow(MasterController *master, QWidget *parent) ServerWindow::ServerWindow(MasterController *master, QWidget *parent)
: ASyncWindow(parent) : ASyncWindow(parent)

View file

@ -1,7 +1,7 @@
#ifndef SQLCODEPREVIEW_H #ifndef SQLCODEPREVIEW_H
#define SQLCODEPREVIEW_H #define SQLCODEPREVIEW_H
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
#include <QPlainTextEdit> #include <QPlainTextEdit>
#include <memory> #include <memory>

View file

@ -1,6 +1,6 @@
#include "SqlSyntaxHighlighter.h" #include "SqlSyntaxHighlighter.h"
#include "PgTypeContainer.h" #include "catalog/PgTypeContainer.h"
#include "SqlLexer.h" #include "SqlLexer.h"

View file

@ -3,7 +3,7 @@
#include <QSyntaxHighlighter> #include <QSyntaxHighlighter>
#include <QTextFormat> #include <QTextFormat>
#include "PgKeywordList.h" #include "catalog/PgKeywordList.h"
#include "util.h" #include "util.h"
class PgTypeContainer; class PgTypeContainer;

View file

@ -1,15 +1,15 @@
#include "TablesPage.h" #include "TablesPage.h"
#include "ui_TablesPage.h" #include "ui_TablesPage.h"
#include "PgAttribute.h" #include "catalog/PgAttribute.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
#include "ColumnPage.h" #include "ColumnPage.h"
#include "ColumnTableModel.h" #include "ColumnTableModel.h"
#include "ConstraintModel.h" #include "ConstraintModel.h"
#include "IconColumnDelegate.h" #include "IconColumnDelegate.h"
#include "IndexModel.h" #include "IndexModel.h"
#include "MainWindow.h" #include "MainWindow.h"
#include "PgIndexContainer.h" #include "catalog/PgIndexContainer.h"
#include "PgLabItemDelegate.h" #include "PgLabItemDelegate.h"
#include "PropertiesPage.h" #include "PropertiesPage.h"
#include "ResultTableModelUtil.h" #include "ResultTableModelUtil.h"

View file

@ -1,9 +1,9 @@
#include "TablesTableModel.h" #include "TablesTableModel.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
#include "PgClass.h" #include "catalog/PgClass.h"
#include "PgClassContainer.h" #include "catalog/PgClassContainer.h"
#include "PgNamespace.h" #include "catalog/PgNamespace.h"
#include "PgNamespaceContainer.h" #include "catalog/PgNamespaceContainer.h"
#include "Pgsql_declare.h" #include "Pgsql_declare.h"
#include "CustomDataRole.h" #include "CustomDataRole.h"
#include <QBrush> #include <QBrush>

View file

@ -2,7 +2,7 @@
#define TABLESTABLEMODEL_H #define TABLESTABLEMODEL_H
#include "BaseTableModel.h" #include "BaseTableModel.h"
#include "PgClass.h" #include "catalog/PgClass.h"
#include <memory> #include <memory>
#include <vector> #include <vector>

View file

@ -2,7 +2,7 @@
#include "ResultTableModelUtil.h" #include "ResultTableModelUtil.h"
#include "UserConfiguration.h" #include "UserConfiguration.h"
#include <QTableView> #include <QTableView>
#include "PgClass.h" #include "catalog/PgClass.h"
#include "SqlCodePreview.h" #include "SqlCodePreview.h"
#include "TriggerTableModel.h" #include "TriggerTableModel.h"
#include "CustomFilterSortModel.h" #include "CustomFilterSortModel.h"

View file

@ -1,6 +1,6 @@
#include "TriggerTableModel.h" #include "TriggerTableModel.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
#include "PgTriggerContainer.h" #include "catalog/PgTriggerContainer.h"
#include "CustomDataRole.h" #include "CustomDataRole.h"
TriggerTableModel::TriggerTableModel(QObject *parent) TriggerTableModel::TriggerTableModel(QObject *parent)

View file

@ -2,8 +2,8 @@
#define TRIGGERTABLEMODEL_H #define TRIGGERTABLEMODEL_H
#include <QAbstractTableModel> #include <QAbstractTableModel>
#include "PgClass.h" #include "catalog/PgClass.h"
#include "PgTrigger.h" #include "catalog/PgTrigger.h"
#include <memory> #include <memory>
class PgDatabaseCatalog; class PgDatabaseCatalog;

View file

@ -1,8 +1,8 @@
#include "QueryGenerator.h" #include "QueryGenerator.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
#include "PgClass.h" #include "catalog/PgClass.h"
#include "PgNamespace.h" #include "catalog/PgNamespace.h"
#include "PgNamespaceContainer.h" #include "catalog/PgNamespaceContainer.h"
using namespace Querygen; using namespace Querygen;

View file

@ -1,5 +1,5 @@
#include "SelectionEditorFactory.h" #include "SelectionEditorFactory.h"
#include "TypeSelectionItemModel.h" #include "model/TypeSelectionItemModel.h"
#include "AbstractModelFactory.h" #include "AbstractModelFactory.h"
#include <QComboBox> #include <QComboBox>

View file

@ -2,16 +2,16 @@
#include <QStringBuilder> #include <QStringBuilder>
#include <cassert> #include <cassert>
#include "PgKeywordList.h" #include "catalog/PgKeywordList.h"
#include "PgConstraint.h" #include "catalog/PgConstraint.h"
#include "PgAttributeContainer.h" #include "catalog/PgAttributeContainer.h"
#include "PgClass.h" #include "catalog/PgClass.h"
#include "PgClassContainer.h" #include "catalog/PgClassContainer.h"
#include "PgIndex.h" #include "catalog/PgIndex.h"
#include "PgNamespace.h" #include "catalog/PgNamespace.h"
#include "PgNamespaceContainer.h" #include "catalog/PgNamespaceContainer.h"
#include "PgDatabaseCatalog.h" #include "catalog/PgDatabaseCatalog.h"
namespace { namespace {

Some files were not shown because too many files have changed in this diff Show more