Reorganize files in pglablib

The enitities and containers of the catalog now go into catalog subfolder
Models go into model

pglab/ColumnPage.cpp

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

pglab/ColumnPage.h

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

pglab/ColumnTableModel.cpp

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

pglab/ColumnTableModel.h

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

pglab/ConstraintModel.cpp

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

pglab/ConstraintModel.h

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

pglab/CrudModel.cpp

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

pglab/CrudModel.h

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

pglab/CrudTab.h

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

pglab/DatabasesTableModel.cpp

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

pglab/EditColumnTableModel.cpp

@@ -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;

pglab/EditTableWidget.cpp

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

pglab/IndexModel.cpp

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

pglab/IndexModel.h

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

pglab/NamespaceItemModel.cpp

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

pglab/NamespaceItemModel.h

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

pglab/OpenDatabase.cpp

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

pglab/ParamTypeDelegate.cpp

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

pglab/ProcTableModel.cpp

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

pglab/ProcTableModel.h

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

pglab/QueryParamListController.cpp

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

pglab/QueryResultModel.cpp

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

pglab/QueryTab.cpp

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

pglab/RolesTableModel.cpp

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

pglab/ServerWindow.cpp

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

pglab/SqlCodePreview.h

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

pglab/SqlSyntaxHighlighter.cpp

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

pglab/SqlSyntaxHighlighter.h

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

pglab/TablesPage.cpp

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

pglab/TablesTableModel.cpp

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

pglab/TablesTableModel.h

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

pglab/TriggerPage.cpp

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

pglab/TriggerTableModel.cpp

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

pglab/TriggerTableModel.h

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

pglablib/QueryGenerator.cpp

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

pglablib/SelectionEditorFactory.cpp

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

pglablib/SqlFormattingUtils.cpp

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