diff --git a/pglab/ColumnPage.cpp b/pglab/ColumnPage.cpp index 336e3a9..8cda6ee 100644 --- a/pglab/ColumnPage.cpp +++ b/pglab/ColumnPage.cpp @@ -2,7 +2,7 @@ #include "ResultTableModelUtil.h" #include "UserConfiguration.h" #include -#include "PgClass.h" +#include "catalog/PgClass.h" #include "SqlCodePreview.h" #include "ColumnTableModel.h" #include "CustomFilterSortModel.h" diff --git a/pglab/ColumnPage.h b/pglab/ColumnPage.h index 67bead6..a030c29 100644 --- a/pglab/ColumnPage.h +++ b/pglab/ColumnPage.h @@ -1,7 +1,7 @@ #ifndef COLUMNPAGE_H #define COLUMNPAGE_H -#include "PgClass.h" +#include "catalog/PgClass.h" #include #include #include diff --git a/pglab/ColumnTableModel.cpp b/pglab/ColumnTableModel.cpp index 02cbe4f..617197c 100644 --- a/pglab/ColumnTableModel.cpp +++ b/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 diff --git a/pglab/ColumnTableModel.h b/pglab/ColumnTableModel.h index 72ec87d..fb1f5c7 100644 --- a/pglab/ColumnTableModel.h +++ b/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 #include #include diff --git a/pglab/ConstraintModel.cpp b/pglab/ConstraintModel.cpp index 05d6f97..4eb2142 100644 --- a/pglab/ConstraintModel.cpp +++ b/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) diff --git a/pglab/ConstraintModel.h b/pglab/ConstraintModel.h index e467fca..ae807df 100644 --- a/pglab/ConstraintModel.h +++ b/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 #include #include diff --git a/pglab/CrudModel.cpp b/pglab/CrudModel.cpp index 3fc1e74..5871591 100644 --- a/pglab/CrudModel.cpp +++ b/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" diff --git a/pglab/CrudModel.h b/pglab/CrudModel.h index 707decf..db21177 100644 --- a/pglab/CrudModel.h +++ b/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 #include diff --git a/pglab/CrudTab.h b/pglab/CrudTab.h index a210592..c00264d 100644 --- a/pglab/CrudTab.h +++ b/pglab/CrudTab.h @@ -1,7 +1,7 @@ #ifndef CRUDTAB_H #define CRUDTAB_H -#include "PgClass.h" +#include "catalog/PgClass.h" #include #include "PlgPage.h" #include diff --git a/pglab/DatabasesTableModel.cpp b/pglab/DatabasesTableModel.cpp index 43bb7fe..de3d996 100644 --- a/pglab/DatabasesTableModel.cpp +++ b/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; diff --git a/pglab/EditColumnTableModel.cpp b/pglab/EditColumnTableModel.cpp index 0a04645..7705724 100644 --- a/pglab/EditColumnTableModel.cpp +++ b/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 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; diff --git a/pglab/EditTableWidget.cpp b/pglab/EditTableWidget.cpp index c582c81..0170559 100644 --- a/pglab/EditTableWidget.cpp +++ b/pglab/EditTableWidget.cpp @@ -4,9 +4,9 @@ #include #include #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 database, QWidget *parent) : QWidget(parent) diff --git a/pglab/IndexModel.cpp b/pglab/IndexModel.cpp index c6b16d1..29011e6 100644 --- a/pglab/IndexModel.cpp +++ b/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" diff --git a/pglab/IndexModel.h b/pglab/IndexModel.h index f931ea7..c238635 100644 --- a/pglab/IndexModel.h +++ b/pglab/IndexModel.h @@ -2,8 +2,8 @@ #define INDEXMODEL_H #include -#include "PgClass.h" -#include "PgIndex.h" +#include "catalog/PgClass.h" +#include "catalog/PgIndex.h" #include #include #include diff --git a/pglab/NamespaceItemModel.cpp b/pglab/NamespaceItemModel.cpp index 6803a85..143c0fd 100644 --- a/pglab/NamespaceItemModel.cpp +++ b/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 { diff --git a/pglab/NamespaceItemModel.h b/pglab/NamespaceItemModel.h index 76261b1..38705d5 100644 --- a/pglab/NamespaceItemModel.h +++ b/pglab/NamespaceItemModel.h @@ -2,7 +2,7 @@ #define NAMESPACEITEMMODEL_H #include -#include "PgNamespace.h" +#include "catalog/PgNamespace.h" #include #include diff --git a/pglab/OpenDatabase.cpp b/pglab/OpenDatabase.cpp index 55e3dbe..a942ad3 100644 --- a/pglab/OpenDatabase.cpp +++ b/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::createOpenDatabase(const ConnectionConfig &cfg) { diff --git a/pglab/ParamTypeDelegate.cpp b/pglab/ParamTypeDelegate.cpp index 2083de8..cb8be12 100644 --- a/pglab/ParamTypeDelegate.cpp +++ b/pglab/ParamTypeDelegate.cpp @@ -1,7 +1,7 @@ #include "ParamTypeDelegate.h" #include -#include "TypeSelectionItemModel.h" +#include "model/TypeSelectionItemModel.h" ParamTypeDelegate::ParamTypeDelegate() {} diff --git a/pglab/ProcTableModel.cpp b/pglab/ProcTableModel.cpp index ebb8731..71ed71a 100644 --- a/pglab/ProcTableModel.cpp +++ b/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) diff --git a/pglab/ProcTableModel.h b/pglab/ProcTableModel.h index fb1bf11..4cc3e21 100644 --- a/pglab/ProcTableModel.h +++ b/pglab/ProcTableModel.h @@ -2,8 +2,8 @@ #define PROCTABLEMODEL_H #include -#include "PgClass.h" -#include "PgProc.h" +#include "catalog/PgClass.h" +#include "catalog/PgProc.h" #include class PgDatabaseCatalog; diff --git a/pglab/QueryParamListController.cpp b/pglab/QueryParamListController.cpp index bd77b47..8c018b9 100644 --- a/pglab/QueryParamListController.cpp +++ b/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 diff --git a/pglab/QueryResultModel.cpp b/pglab/QueryResultModel.cpp index b489ce1..6d5c5bd 100644 --- a/pglab/QueryResultModel.cpp +++ b/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 #include diff --git a/pglab/QueryTab.cpp b/pglab/QueryTab.cpp index e83b9a8..96d8254 100644 --- a/pglab/QueryTab.cpp +++ b/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" diff --git a/pglab/RolesTableModel.cpp b/pglab/RolesTableModel.cpp index 4f51b83..bd1c86a 100644 --- a/pglab/RolesTableModel.cpp +++ b/pglab/RolesTableModel.cpp @@ -1,5 +1,5 @@ #include "RolesTableModel.h" -#include "PgAuthIdContainer.h" +#include "catalog/PgAuthIdContainer.h" RolesTableModel::RolesTableModel(QObject *parent) : BaseTableModel(parent) diff --git a/pglab/ServerWindow.cpp b/pglab/ServerWindow.cpp index aaaa4f0..c2c49da 100644 --- a/pglab/ServerWindow.cpp +++ b/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) diff --git a/pglab/SqlCodePreview.h b/pglab/SqlCodePreview.h index dd0580f..ccc0da4 100644 --- a/pglab/SqlCodePreview.h +++ b/pglab/SqlCodePreview.h @@ -1,7 +1,7 @@ #ifndef SQLCODEPREVIEW_H #define SQLCODEPREVIEW_H -#include "PgDatabaseCatalog.h" +#include "catalog/PgDatabaseCatalog.h" #include #include diff --git a/pglab/SqlSyntaxHighlighter.cpp b/pglab/SqlSyntaxHighlighter.cpp index 0ea1c6f..d61b08e 100644 --- a/pglab/SqlSyntaxHighlighter.cpp +++ b/pglab/SqlSyntaxHighlighter.cpp @@ -1,6 +1,6 @@ #include "SqlSyntaxHighlighter.h" -#include "PgTypeContainer.h" +#include "catalog/PgTypeContainer.h" #include "SqlLexer.h" diff --git a/pglab/SqlSyntaxHighlighter.h b/pglab/SqlSyntaxHighlighter.h index 9f43e52..32a9767 100644 --- a/pglab/SqlSyntaxHighlighter.h +++ b/pglab/SqlSyntaxHighlighter.h @@ -3,7 +3,7 @@ #include #include -#include "PgKeywordList.h" +#include "catalog/PgKeywordList.h" #include "util.h" class PgTypeContainer; diff --git a/pglab/TablesPage.cpp b/pglab/TablesPage.cpp index 8c2abfa..f0ce545 100644 --- a/pglab/TablesPage.cpp +++ b/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" diff --git a/pglab/TablesTableModel.cpp b/pglab/TablesTableModel.cpp index 2b5e190..8794347 100644 --- a/pglab/TablesTableModel.cpp +++ b/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 diff --git a/pglab/TablesTableModel.h b/pglab/TablesTableModel.h index c1d632d..264c575 100644 --- a/pglab/TablesTableModel.h +++ b/pglab/TablesTableModel.h @@ -2,7 +2,7 @@ #define TABLESTABLEMODEL_H #include "BaseTableModel.h" -#include "PgClass.h" +#include "catalog/PgClass.h" #include #include diff --git a/pglab/TriggerPage.cpp b/pglab/TriggerPage.cpp index f214fa9..9a4afbe 100644 --- a/pglab/TriggerPage.cpp +++ b/pglab/TriggerPage.cpp @@ -2,7 +2,7 @@ #include "ResultTableModelUtil.h" #include "UserConfiguration.h" #include -#include "PgClass.h" +#include "catalog/PgClass.h" #include "SqlCodePreview.h" #include "TriggerTableModel.h" #include "CustomFilterSortModel.h" diff --git a/pglab/TriggerTableModel.cpp b/pglab/TriggerTableModel.cpp index 716d91a..d69d070 100644 --- a/pglab/TriggerTableModel.cpp +++ b/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) diff --git a/pglab/TriggerTableModel.h b/pglab/TriggerTableModel.h index 813039d..744abbe 100644 --- a/pglab/TriggerTableModel.h +++ b/pglab/TriggerTableModel.h @@ -2,8 +2,8 @@ #define TRIGGERTABLEMODEL_H #include -#include "PgClass.h" -#include "PgTrigger.h" +#include "catalog/PgClass.h" +#include "catalog/PgTrigger.h" #include class PgDatabaseCatalog; diff --git a/pglablib/QueryGenerator.cpp b/pglablib/QueryGenerator.cpp index 2dda1ca..2aa2eff 100644 --- a/pglablib/QueryGenerator.cpp +++ b/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; diff --git a/pglablib/SelectionEditorFactory.cpp b/pglablib/SelectionEditorFactory.cpp index df940df..a3a5bf2 100644 --- a/pglablib/SelectionEditorFactory.cpp +++ b/pglablib/SelectionEditorFactory.cpp @@ -1,5 +1,5 @@ #include "SelectionEditorFactory.h" -#include "TypeSelectionItemModel.h" +#include "model/TypeSelectionItemModel.h" #include "AbstractModelFactory.h" #include diff --git a/pglablib/SqlFormattingUtils.cpp b/pglablib/SqlFormattingUtils.cpp index 15c8936..0429e13 100644 --- a/pglablib/SqlFormattingUtils.cpp +++ b/pglablib/SqlFormattingUtils.cpp @@ -2,16 +2,16 @@ #include #include -#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 { diff --git a/pglablib/PgAm.cpp b/pglablib/catalog/PgAm.cpp similarity index 100% rename from pglablib/PgAm.cpp rename to pglablib/catalog/PgAm.cpp diff --git a/pglablib/PgAm.h b/pglablib/catalog/PgAm.h similarity index 100% rename from pglablib/PgAm.h rename to pglablib/catalog/PgAm.h diff --git a/pglablib/PgAmContainer.cpp b/pglablib/catalog/PgAmContainer.cpp similarity index 100% rename from pglablib/PgAmContainer.cpp rename to pglablib/catalog/PgAmContainer.cpp diff --git a/pglablib/PgAmContainer.h b/pglablib/catalog/PgAmContainer.h similarity index 100% rename from pglablib/PgAmContainer.h rename to pglablib/catalog/PgAmContainer.h diff --git a/pglablib/PgAttribute.cpp b/pglablib/catalog/PgAttribute.cpp similarity index 100% rename from pglablib/PgAttribute.cpp rename to pglablib/catalog/PgAttribute.cpp diff --git a/pglablib/PgAttribute.h b/pglablib/catalog/PgAttribute.h similarity index 100% rename from pglablib/PgAttribute.h rename to pglablib/catalog/PgAttribute.h diff --git a/pglablib/PgAttributeContainer.cpp b/pglablib/catalog/PgAttributeContainer.cpp similarity index 100% rename from pglablib/PgAttributeContainer.cpp rename to pglablib/catalog/PgAttributeContainer.cpp diff --git a/pglablib/PgAttributeContainer.h b/pglablib/catalog/PgAttributeContainer.h similarity index 100% rename from pglablib/PgAttributeContainer.h rename to pglablib/catalog/PgAttributeContainer.h diff --git a/pglablib/PgAuthId.cpp b/pglablib/catalog/PgAuthId.cpp similarity index 100% rename from pglablib/PgAuthId.cpp rename to pglablib/catalog/PgAuthId.cpp diff --git a/pglablib/PgAuthId.h b/pglablib/catalog/PgAuthId.h similarity index 100% rename from pglablib/PgAuthId.h rename to pglablib/catalog/PgAuthId.h diff --git a/pglablib/PgAuthIdContainer.cpp b/pglablib/catalog/PgAuthIdContainer.cpp similarity index 100% rename from pglablib/PgAuthIdContainer.cpp rename to pglablib/catalog/PgAuthIdContainer.cpp diff --git a/pglablib/PgAuthIdContainer.h b/pglablib/catalog/PgAuthIdContainer.h similarity index 100% rename from pglablib/PgAuthIdContainer.h rename to pglablib/catalog/PgAuthIdContainer.h diff --git a/pglablib/PgCatalogTypes.h b/pglablib/catalog/PgCatalogTypes.h similarity index 100% rename from pglablib/PgCatalogTypes.h rename to pglablib/catalog/PgCatalogTypes.h diff --git a/pglablib/PgClass.cpp b/pglablib/catalog/PgClass.cpp similarity index 100% rename from pglablib/PgClass.cpp rename to pglablib/catalog/PgClass.cpp diff --git a/pglablib/PgClass.h b/pglablib/catalog/PgClass.h similarity index 100% rename from pglablib/PgClass.h rename to pglablib/catalog/PgClass.h diff --git a/pglablib/PgClassContainer.cpp b/pglablib/catalog/PgClassContainer.cpp similarity index 100% rename from pglablib/PgClassContainer.cpp rename to pglablib/catalog/PgClassContainer.cpp diff --git a/pglablib/PgClassContainer.h b/pglablib/catalog/PgClassContainer.h similarity index 100% rename from pglablib/PgClassContainer.h rename to pglablib/catalog/PgClassContainer.h diff --git a/pglablib/PgCollation.cpp b/pglablib/catalog/PgCollation.cpp similarity index 100% rename from pglablib/PgCollation.cpp rename to pglablib/catalog/PgCollation.cpp diff --git a/pglablib/PgCollation.h b/pglablib/catalog/PgCollation.h similarity index 100% rename from pglablib/PgCollation.h rename to pglablib/catalog/PgCollation.h diff --git a/pglablib/PgCollationContainer.cpp b/pglablib/catalog/PgCollationContainer.cpp similarity index 100% rename from pglablib/PgCollationContainer.cpp rename to pglablib/catalog/PgCollationContainer.cpp diff --git a/pglablib/PgCollationContainer.h b/pglablib/catalog/PgCollationContainer.h similarity index 100% rename from pglablib/PgCollationContainer.h rename to pglablib/catalog/PgCollationContainer.h diff --git a/pglablib/PgConstraint.cpp b/pglablib/catalog/PgConstraint.cpp similarity index 100% rename from pglablib/PgConstraint.cpp rename to pglablib/catalog/PgConstraint.cpp diff --git a/pglablib/PgConstraint.h b/pglablib/catalog/PgConstraint.h similarity index 100% rename from pglablib/PgConstraint.h rename to pglablib/catalog/PgConstraint.h diff --git a/pglablib/PgConstraintContainer.cpp b/pglablib/catalog/PgConstraintContainer.cpp similarity index 100% rename from pglablib/PgConstraintContainer.cpp rename to pglablib/catalog/PgConstraintContainer.cpp diff --git a/pglablib/PgConstraintContainer.h b/pglablib/catalog/PgConstraintContainer.h similarity index 100% rename from pglablib/PgConstraintContainer.h rename to pglablib/catalog/PgConstraintContainer.h diff --git a/pglablib/PgContainer.cpp b/pglablib/catalog/PgContainer.cpp similarity index 100% rename from pglablib/PgContainer.cpp rename to pglablib/catalog/PgContainer.cpp diff --git a/pglablib/PgContainer.h b/pglablib/catalog/PgContainer.h similarity index 100% rename from pglablib/PgContainer.h rename to pglablib/catalog/PgContainer.h diff --git a/pglablib/PgDatabase.cpp b/pglablib/catalog/PgDatabase.cpp similarity index 100% rename from pglablib/PgDatabase.cpp rename to pglablib/catalog/PgDatabase.cpp diff --git a/pglablib/PgDatabase.h b/pglablib/catalog/PgDatabase.h similarity index 100% rename from pglablib/PgDatabase.h rename to pglablib/catalog/PgDatabase.h diff --git a/pglablib/PgDatabaseCatalog.cpp b/pglablib/catalog/PgDatabaseCatalog.cpp similarity index 100% rename from pglablib/PgDatabaseCatalog.cpp rename to pglablib/catalog/PgDatabaseCatalog.cpp diff --git a/pglablib/PgDatabaseCatalog.h b/pglablib/catalog/PgDatabaseCatalog.h similarity index 100% rename from pglablib/PgDatabaseCatalog.h rename to pglablib/catalog/PgDatabaseCatalog.h diff --git a/pglablib/PgDatabaseContainer.cpp b/pglablib/catalog/PgDatabaseContainer.cpp similarity index 100% rename from pglablib/PgDatabaseContainer.cpp rename to pglablib/catalog/PgDatabaseContainer.cpp diff --git a/pglablib/PgDatabaseContainer.h b/pglablib/catalog/PgDatabaseContainer.h similarity index 100% rename from pglablib/PgDatabaseContainer.h rename to pglablib/catalog/PgDatabaseContainer.h diff --git a/pglablib/PgDatabaseObject.cpp b/pglablib/catalog/PgDatabaseObject.cpp similarity index 100% rename from pglablib/PgDatabaseObject.cpp rename to pglablib/catalog/PgDatabaseObject.cpp diff --git a/pglablib/PgDatabaseObject.h b/pglablib/catalog/PgDatabaseObject.h similarity index 100% rename from pglablib/PgDatabaseObject.h rename to pglablib/catalog/PgDatabaseObject.h diff --git a/pglablib/PgIndex.cpp b/pglablib/catalog/PgIndex.cpp similarity index 100% rename from pglablib/PgIndex.cpp rename to pglablib/catalog/PgIndex.cpp diff --git a/pglablib/PgIndex.h b/pglablib/catalog/PgIndex.h similarity index 100% rename from pglablib/PgIndex.h rename to pglablib/catalog/PgIndex.h diff --git a/pglablib/PgIndexContainer.cpp b/pglablib/catalog/PgIndexContainer.cpp similarity index 100% rename from pglablib/PgIndexContainer.cpp rename to pglablib/catalog/PgIndexContainer.cpp diff --git a/pglablib/PgIndexContainer.h b/pglablib/catalog/PgIndexContainer.h similarity index 100% rename from pglablib/PgIndexContainer.h rename to pglablib/catalog/PgIndexContainer.h diff --git a/pglablib/PgInherits.cpp b/pglablib/catalog/PgInherits.cpp similarity index 100% rename from pglablib/PgInherits.cpp rename to pglablib/catalog/PgInherits.cpp diff --git a/pglablib/PgInherits.h b/pglablib/catalog/PgInherits.h similarity index 100% rename from pglablib/PgInherits.h rename to pglablib/catalog/PgInherits.h diff --git a/pglablib/PgInheritsContainer.cpp b/pglablib/catalog/PgInheritsContainer.cpp similarity index 100% rename from pglablib/PgInheritsContainer.cpp rename to pglablib/catalog/PgInheritsContainer.cpp diff --git a/pglablib/PgInheritsContainer.h b/pglablib/catalog/PgInheritsContainer.h similarity index 100% rename from pglablib/PgInheritsContainer.h rename to pglablib/catalog/PgInheritsContainer.h diff --git a/pglablib/PgKeywordList.cpp b/pglablib/catalog/PgKeywordList.cpp similarity index 100% rename from pglablib/PgKeywordList.cpp rename to pglablib/catalog/PgKeywordList.cpp diff --git a/pglablib/PgKeywordList.h b/pglablib/catalog/PgKeywordList.h similarity index 100% rename from pglablib/PgKeywordList.h rename to pglablib/catalog/PgKeywordList.h diff --git a/pglablib/PgNamespace.cpp b/pglablib/catalog/PgNamespace.cpp similarity index 100% rename from pglablib/PgNamespace.cpp rename to pglablib/catalog/PgNamespace.cpp diff --git a/pglablib/PgNamespace.h b/pglablib/catalog/PgNamespace.h similarity index 100% rename from pglablib/PgNamespace.h rename to pglablib/catalog/PgNamespace.h diff --git a/pglablib/PgNamespaceContainer.cpp b/pglablib/catalog/PgNamespaceContainer.cpp similarity index 100% rename from pglablib/PgNamespaceContainer.cpp rename to pglablib/catalog/PgNamespaceContainer.cpp diff --git a/pglablib/PgNamespaceContainer.h b/pglablib/catalog/PgNamespaceContainer.h similarity index 100% rename from pglablib/PgNamespaceContainer.h rename to pglablib/catalog/PgNamespaceContainer.h diff --git a/pglablib/PgNamespaceObject.cpp b/pglablib/catalog/PgNamespaceObject.cpp similarity index 100% rename from pglablib/PgNamespaceObject.cpp rename to pglablib/catalog/PgNamespaceObject.cpp diff --git a/pglablib/PgNamespaceObject.h b/pglablib/catalog/PgNamespaceObject.h similarity index 100% rename from pglablib/PgNamespaceObject.h rename to pglablib/catalog/PgNamespaceObject.h diff --git a/pglablib/PgObject.cpp b/pglablib/catalog/PgObject.cpp similarity index 100% rename from pglablib/PgObject.cpp rename to pglablib/catalog/PgObject.cpp diff --git a/pglablib/PgObject.h b/pglablib/catalog/PgObject.h similarity index 100% rename from pglablib/PgObject.h rename to pglablib/catalog/PgObject.h diff --git a/pglablib/PgOwnedObject.cpp b/pglablib/catalog/PgOwnedObject.cpp similarity index 100% rename from pglablib/PgOwnedObject.cpp rename to pglablib/catalog/PgOwnedObject.cpp diff --git a/pglablib/PgOwnedObject.h b/pglablib/catalog/PgOwnedObject.h similarity index 100% rename from pglablib/PgOwnedObject.h rename to pglablib/catalog/PgOwnedObject.h diff --git a/pglablib/PgProc.cpp b/pglablib/catalog/PgProc.cpp similarity index 100% rename from pglablib/PgProc.cpp rename to pglablib/catalog/PgProc.cpp diff --git a/pglablib/PgProc.h b/pglablib/catalog/PgProc.h similarity index 100% rename from pglablib/PgProc.h rename to pglablib/catalog/PgProc.h diff --git a/pglablib/PgProcContainer.cpp b/pglablib/catalog/PgProcContainer.cpp similarity index 100% rename from pglablib/PgProcContainer.cpp rename to pglablib/catalog/PgProcContainer.cpp diff --git a/pglablib/PgProcContainer.h b/pglablib/catalog/PgProcContainer.h similarity index 100% rename from pglablib/PgProcContainer.h rename to pglablib/catalog/PgProcContainer.h diff --git a/pglablib/PgServerObject.cpp b/pglablib/catalog/PgServerObject.cpp similarity index 100% rename from pglablib/PgServerObject.cpp rename to pglablib/catalog/PgServerObject.cpp diff --git a/pglablib/PgServerObject.h b/pglablib/catalog/PgServerObject.h similarity index 100% rename from pglablib/PgServerObject.h rename to pglablib/catalog/PgServerObject.h diff --git a/pglablib/PgTablespace.cpp b/pglablib/catalog/PgTablespace.cpp similarity index 100% rename from pglablib/PgTablespace.cpp rename to pglablib/catalog/PgTablespace.cpp diff --git a/pglablib/PgTablespace.h b/pglablib/catalog/PgTablespace.h similarity index 100% rename from pglablib/PgTablespace.h rename to pglablib/catalog/PgTablespace.h diff --git a/pglablib/PgTablespaceContainer.cpp b/pglablib/catalog/PgTablespaceContainer.cpp similarity index 100% rename from pglablib/PgTablespaceContainer.cpp rename to pglablib/catalog/PgTablespaceContainer.cpp diff --git a/pglablib/PgTablespaceContainer.h b/pglablib/catalog/PgTablespaceContainer.h similarity index 100% rename from pglablib/PgTablespaceContainer.h rename to pglablib/catalog/PgTablespaceContainer.h diff --git a/pglablib/PgTrigger.cpp b/pglablib/catalog/PgTrigger.cpp similarity index 100% rename from pglablib/PgTrigger.cpp rename to pglablib/catalog/PgTrigger.cpp diff --git a/pglablib/PgTrigger.h b/pglablib/catalog/PgTrigger.h similarity index 100% rename from pglablib/PgTrigger.h rename to pglablib/catalog/PgTrigger.h diff --git a/pglablib/PgTriggerContainer.cpp b/pglablib/catalog/PgTriggerContainer.cpp similarity index 100% rename from pglablib/PgTriggerContainer.cpp rename to pglablib/catalog/PgTriggerContainer.cpp diff --git a/pglablib/PgTriggerContainer.h b/pglablib/catalog/PgTriggerContainer.h similarity index 100% rename from pglablib/PgTriggerContainer.h rename to pglablib/catalog/PgTriggerContainer.h diff --git a/pglablib/PgType.cpp b/pglablib/catalog/PgType.cpp similarity index 100% rename from pglablib/PgType.cpp rename to pglablib/catalog/PgType.cpp diff --git a/pglablib/PgType.h b/pglablib/catalog/PgType.h similarity index 100% rename from pglablib/PgType.h rename to pglablib/catalog/PgType.h diff --git a/pglablib/PgTypeContainer.cpp b/pglablib/catalog/PgTypeContainer.cpp similarity index 100% rename from pglablib/PgTypeContainer.cpp rename to pglablib/catalog/PgTypeContainer.cpp diff --git a/pglablib/PgTypeContainer.h b/pglablib/catalog/PgTypeContainer.h similarity index 100% rename from pglablib/PgTypeContainer.h rename to pglablib/catalog/PgTypeContainer.h diff --git a/pglablib/codebuilder/DefaultConfigs.cpp b/pglablib/codebuilder/DefaultConfigs.cpp index cebbe21..e8bd8c0 100644 --- a/pglablib/codebuilder/DefaultConfigs.cpp +++ b/pglablib/codebuilder/DefaultConfigs.cpp @@ -6,7 +6,7 @@ #include "StructureTemplate.h" #include "TypeMappings.h" #include "Pgsql_oids.h" -#include "PgDatabaseCatalog.h" +#include "catalog/PgDatabaseCatalog.h" using namespace Pgsql; @@ -29,7 +29,7 @@ std::shared_ptr GetPglabCppTypeMappings(std::shared_ptrsetDefaultStringType("QString"); tm->setDefaultContainerType("std::vector<%1>"); - return tm; + return std::move(tm); } std::shared_ptr buildPglabStructureTemplate() diff --git a/pglablib/codebuilder/TypeMappings.cpp b/pglablib/codebuilder/TypeMappings.cpp index 7e7b180..5d76cbf 100644 --- a/pglablib/codebuilder/TypeMappings.cpp +++ b/pglablib/codebuilder/TypeMappings.cpp @@ -1,5 +1,5 @@ #include "TypeMappings.h" -#include "PgTypeContainer.h" +#include "catalog/PgTypeContainer.h" //namespace { // using Fallbacks = std::unordered_map; diff --git a/pglablib/model/CollationModel.cpp b/pglablib/model/CollationModel.cpp new file mode 100644 index 0000000..b6e9d3b --- /dev/null +++ b/pglablib/model/CollationModel.cpp @@ -0,0 +1,6 @@ +#include "CollationModel.h" + +CollationModel::CollationModel() +{ + +} diff --git a/pglablib/model/CollationModel.h b/pglablib/model/CollationModel.h new file mode 100644 index 0000000..157edf2 --- /dev/null +++ b/pglablib/model/CollationModel.h @@ -0,0 +1,11 @@ +#ifndef COLLATIONMODEL_H +#define COLLATIONMODEL_H + + +class CollationModel +{ +public: + CollationModel(); +}; + +#endif // COLLATIONMODEL_H \ No newline at end of file diff --git a/pglablib/model/CollationModelFactory.cpp b/pglablib/model/CollationModelFactory.cpp new file mode 100644 index 0000000..324568e --- /dev/null +++ b/pglablib/model/CollationModelFactory.cpp @@ -0,0 +1,6 @@ +#include "CollationModelFactory.h" + +CollationModelFactory::CollationModelFactory() +{ + +} diff --git a/pglablib/model/CollationModelFactory.h b/pglablib/model/CollationModelFactory.h new file mode 100644 index 0000000..fa41525 --- /dev/null +++ b/pglablib/model/CollationModelFactory.h @@ -0,0 +1,11 @@ +#ifndef COLLATIONMODELFACTORY_H +#define COLLATIONMODELFACTORY_H + + +class CollationModelFactory +{ +public: + CollationModelFactory(); +}; + +#endif // COLLATIONMODELFACTORY_H \ No newline at end of file diff --git a/pglablib/TypeModelFactory.cpp b/pglablib/model/TypeModelFactory.cpp similarity index 100% rename from pglablib/TypeModelFactory.cpp rename to pglablib/model/TypeModelFactory.cpp diff --git a/pglablib/TypeModelFactory.h b/pglablib/model/TypeModelFactory.h similarity index 96% rename from pglablib/TypeModelFactory.h rename to pglablib/model/TypeModelFactory.h index 8a49ca0..1c7f967 100644 --- a/pglablib/TypeModelFactory.h +++ b/pglablib/model/TypeModelFactory.h @@ -4,7 +4,6 @@ #include "AbstractModelFactory.h" class PgTypeContainer; -void setTypeList(); class TypeModelFactory: public AbstractModelFactory { Q_OBJECT diff --git a/pglablib/TypeSelectionItemModel.cpp b/pglablib/model/TypeSelectionItemModel.cpp similarity index 98% rename from pglablib/TypeSelectionItemModel.cpp rename to pglablib/model/TypeSelectionItemModel.cpp index cefe5ff..a148739 100644 --- a/pglablib/TypeSelectionItemModel.cpp +++ b/pglablib/model/TypeSelectionItemModel.cpp @@ -1,5 +1,5 @@ #include "TypeSelectionItemModel.h" -#include "PgTypeContainer.h" +#include "catalog/PgTypeContainer.h" #include TypeSelectionItemModel::TypeSelectionItemModel(QObject *parent) diff --git a/pglablib/TypeSelectionItemModel.h b/pglablib/model/TypeSelectionItemModel.h similarity index 100% rename from pglablib/TypeSelectionItemModel.h rename to pglablib/model/TypeSelectionItemModel.h diff --git a/pglablib/pglablib.pro b/pglablib/pglablib.pro index bcf84ef..9cfbeef 100644 --- a/pglablib/pglablib.pro +++ b/pglablib/pglablib.pro @@ -25,123 +25,123 @@ SOURCES += \ Pglablib.cpp \ ASyncDBConnection.cpp \ ConnectionConfig.cpp \ - PgType.cpp \ - PgTypeContainer.cpp \ - PgNamespace.cpp \ - PgClass.cpp \ - PgDatabase.cpp \ - PgDatabaseContainer.cpp \ - PgAuthId.cpp \ - PgAuthIdContainer.cpp \ - PgClassContainer.cpp \ - PgDatabaseCatalog.cpp \ - PgNamespaceContainer.cpp \ - PgAttribute.cpp \ - PgContainer.cpp \ - PgAttributeContainer.cpp \ - PgIndex.cpp \ - PgIndexContainer.cpp \ - PgConstraint.cpp \ - PgConstraintContainer.cpp \ + catalog/PgType.cpp \ + catalog/PgTypeContainer.cpp \ + catalog/PgNamespace.cpp \ + catalog/PgClass.cpp \ + catalog/PgDatabase.cpp \ + catalog/PgDatabaseContainer.cpp \ + catalog/PgAuthId.cpp \ + catalog/PgAuthIdContainer.cpp \ + catalog/PgClassContainer.cpp \ + catalog/PgDatabaseCatalog.cpp \ + catalog/PgNamespaceContainer.cpp \ + catalog/PgAttribute.cpp \ + catalog/PgContainer.cpp \ + catalog/PgAttributeContainer.cpp \ + catalog/PgIndex.cpp \ + catalog/PgIndexContainer.cpp \ + catalog/PgConstraint.cpp \ + catalog/PgConstraintContainer.cpp \ ParamListJson.cpp \ ParamListModel.cpp \ util.cpp \ SqlFormattingUtils.cpp \ - PgKeywordList.cpp \ + catalog/PgKeywordList.cpp \ QueryGenerator.cpp \ - PgAm.cpp \ - PgAmContainer.cpp \ - PgObject.cpp \ - PgTablespace.cpp \ -PgTablespaceContainer.cpp \ -codebuilder/LanguageConfig.cpp \ -codebuilder/CodeBuilder.cpp \ -codebuilder/NameManglingRules.cpp \ -codebuilder/DefaultConfigs.cpp \ -codebuilder/TypeMappings.cpp \ -codebuilder/IndentationConfig.cpp \ -codebuilder/StructureTemplate.cpp \ + catalog/PgObject.cpp \ + catalog/PgTablespace.cpp \ + catalog/PgTablespaceContainer.cpp \ + codebuilder/LanguageConfig.cpp \ + codebuilder/CodeBuilder.cpp \ + codebuilder/NameManglingRules.cpp \ + codebuilder/DefaultConfigs.cpp \ + codebuilder/TypeMappings.cpp \ + codebuilder/IndentationConfig.cpp \ + codebuilder/StructureTemplate.cpp \ FormatToStream.cpp \ codebuilder/StringLiteralRules.cpp \ codebuilder/StringEscapeRule.cpp \ - PgTrigger.cpp \ - PgTriggerContainer.cpp \ - PgProc.cpp \ - PgProcContainer.cpp \ - PgDatabaseObject.cpp \ - PgServerObject.cpp \ - PgOwnedObject.cpp \ - PgNamespaceObject.cpp \ - PgCollation.cpp \ - PgCollationContainer.cpp \ - PgInherits.cpp \ - PgInheritsContainer.cpp \ - TypeSelectionItemModel.cpp \ + catalog/PgTrigger.cpp \ + catalog/PgTriggerContainer.cpp \ + catalog/PgProc.cpp \ + catalog/PgProcContainer.cpp \ + catalog/PgDatabaseObject.cpp \ + catalog/PgServerObject.cpp \ + catalog/PgOwnedObject.cpp \ + catalog/PgNamespaceObject.cpp \ + catalog/PgCollation.cpp \ + catalog/PgCollationContainer.cpp \ + catalog/PgInherits.cpp \ + catalog/PgInheritsContainer.cpp \ SelectionEditorFactory.cpp \ - TypeModelFactory.cpp + catalog/PgAm.cpp \ + model/TypeModelFactory.cpp \ + model/TypeSelectionItemModel.cpp \ + catalog/PgAmContainer.cpp HEADERS += \ Pglablib.h \ ASyncDBConnection.h \ ConnectionConfig.h \ - PgType.h \ - PgTypeContainer.h \ - PgNamespace.h \ - PgClass.h \ - PgDatabase.h \ - PgDatabaseContainer.h \ - PgContainer.h \ - PgAuthId.h \ - PgAuthIdContainer.h \ - PgClassContainer.h \ - PgDatabaseCatalog.h \ - PgNamespaceContainer.h \ - PgAttribute.h \ - PgAttributeContainer.h \ - PgIndex.h \ - PgIndexContainer.h \ - PgConstraint.h \ - PgConstraintContainer.h \ + catalog/PgType.h \ + catalog/PgTypeContainer.h \ + catalog/PgNamespace.h \ + catalog/PgClass.h \ + catalog/PgDatabase.h \ + catalog/PgDatabaseContainer.h \ + catalog/PgContainer.h \ + catalog/PgAuthId.h \ + catalog/PgAuthIdContainer.h \ + catalog/PgClassContainer.h \ + catalog/PgDatabaseCatalog.h \ + catalog/PgNamespaceContainer.h \ + catalog/PgAttribute.h \ + catalog/PgAttributeContainer.h \ + catalog/PgIndex.h \ + catalog/PgIndexContainer.h \ + catalog/PgConstraint.h \ + catalog/PgConstraintContainer.h \ ParamListJson.h \ ParamListModel.h \ util.h \ SqlFormattingUtils.h \ - PgCatalogTypes.h \ - PgKeywordList.h \ + catalog/PgCatalogTypes.h \ + catalog/PgKeywordList.h \ QueryGenerator.h \ - PgAm.h \ - PgAmContainer.h \ - PgObject.h \ - PgTablespace.h \ -PgTablespaceContainer.h \ -codebuilder/LanguageConfig.h \ -codebuilder/CodeBuilder.h \ -codebuilder/NameManglingRules.h \ -codebuilder/DefaultConfigs.h \ -codebuilder/TypeMappings.h \ -codebuilder/IndentationConfig.h \ -codebuilder/StructureTemplate.h \ + catalog/PgObject.h \ + catalog/PgTablespace.h \ + catalog/PgTablespaceContainer.h \ + codebuilder/LanguageConfig.h \ + codebuilder/CodeBuilder.h \ + codebuilder/NameManglingRules.h \ + codebuilder/DefaultConfigs.h \ + codebuilder/TypeMappings.h \ + codebuilder/IndentationConfig.h \ + codebuilder/StructureTemplate.h \ FormatToStream.h \ codebuilder/ResultLoopTemplate.h \ codebuilder/StringEscapeRule.h \ codebuilder/StringLiteralRules.h \ - PgTrigger.h \ - PgTriggerContainer.h \ - PgProc.h \ - PgProcContainer.h \ - PgDatabaseObject.h \ - PgServerObject.h \ - PgOwnedObject.h \ - PgNamespaceObject.h \ - PgCollation.h \ - PgCollationContainer.h \ + catalog/PgTrigger.h \ + catalog/PgTriggerContainer.h \ + catalog/PgProc.h \ + catalog/PgProcContainer.h \ + catalog/PgDatabaseObject.h \ + catalog/PgServerObject.h \ + catalog/PgOwnedObject.h \ + catalog/PgNamespaceObject.h \ + catalog/PgCollation.h \ + catalog/PgCollationContainer.h \ AbstractModelFactory.h \ AbstractEditorFactory.h \ - PgInherits.h \ - PgInheritsContainer.h \ + catalog/PgInherits.h \ + catalog/PgInheritsContainer.h \ SelectionEditorFactory.h \ - TypeSelectionItemModel.h \ - TypeModelFactory.h + model/TypeSelectionItemModel.h \ + model/TypeModelFactory.h \ + catalog/PgAm.h \ + catalog/PgAmContainer.h unix { target.path = /usr/lib