From 7db859737a202b964eea96fc76c199a2cce89857 Mon Sep 17 00:00:00 2001 From: eelke Date: Sun, 25 Nov 2018 09:05:01 +0100 Subject: [PATCH] Use catalog instead of catalogue consistently --- pglab/CrudModel.cpp | 14 +++++++------- pglab/MainWindow.cpp | 6 +++--- pglab/OpenDatabase.cpp | 10 +++++----- pglab/OpenDatabase.h | 4 ++-- pglab/QueryParamListController.cpp | 2 +- pglab/QueryTab.cpp | 2 +- pglab/ServerWindow.cpp | 2 +- pglablib/PgConstraintContainer.cpp | 2 +- pglablib/PgContainer.h | 4 ++-- pglablib/PgDatabaseContainer.h | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pglab/CrudModel.cpp b/pglab/CrudModel.cpp index 5ecf976..5dd1537 100644 --- a/pglab/CrudModel.cpp +++ b/pglab/CrudModel.cpp @@ -38,7 +38,7 @@ void CrudModel::setConfig(std::shared_ptr db, const PgClass &table { m_database = db; m_table = table; - m_primaryKey = db->catalogue()->constraints()->getPrimaryForRelation(table.oid); + m_primaryKey = db->catalog()->constraints()->getPrimaryForRelation(table.oid); //cat->attributes()->getColumnsForRelation() callLoadData = true; auto dbconfig = m_database->config(); @@ -52,7 +52,7 @@ QVariant CrudModel::headerData(int section, Qt::Orientation orientation, int rol if (orientation == Qt::Horizontal) { QString s(m_roData->getColName(section)); s += "\n"; - s += getTypeDisplayString(*m_database->catalogue(), getType(section)); + s += getTypeDisplayString(*m_database->catalog(), getType(section)); r = s; } else { @@ -163,7 +163,7 @@ QVariant CrudModel::data(const QModelIndex &index, int role) const void CrudModel::loadData() { - QString table_name = genFQTableName(*m_database->catalogue(), m_table); + QString table_name = genFQTableName(*m_database->catalog(), m_table); std::string q = "SELECT * FROM "; q += std::string(table_name.toUtf8().data()); m_dbConn.send(q, [this] (Expected> res, qint64) { @@ -295,7 +295,7 @@ std::tuple CrudModel::createUpdateQuery(const PKeyValues { Pgsql::Params params; auto data = pending_row.data(); - QString table_name = genFQTableName(*m_database->catalogue(), m_table); + QString table_name = genFQTableName(*m_database->catalog(), m_table); QString buffer; QTextStream q(&buffer); q << "UPDATE " << table_name << " AS d\n SET "; @@ -329,12 +329,12 @@ std::tuple CrudModel::createInsertQuery(const PendingRow { Pgsql::Params params; auto data = pending_row.data(); - QString table_name = genFQTableName(*m_database->catalogue(), m_table); + QString table_name = genFQTableName(*m_database->catalog(), m_table); QString buffer; QTextStream q(&buffer); q << "INSERT INTO " << table_name << "("; - auto columns = m_database->catalogue()->attributes()->getColumnsForRelation(m_table.oid); + auto columns = m_database->catalog()->attributes()->getColumnsForRelation(m_table.oid); bool first = true; for (auto e : data) { int num = e.first + 1; @@ -362,7 +362,7 @@ std::tuple CrudModel::createInsertQuery(const PendingRow std::tuple CrudModel::createDeleteStatement(const PKeyValues &pkey_values) { Pgsql::Params params; - QString table_name = genFQTableName(*m_database->catalogue(), m_table); + QString table_name = genFQTableName(*m_database->catalog(), m_table); QString buffer; QTextStream q(&buffer); q << "DELETE FROM " << table_name; diff --git a/pglab/MainWindow.cpp b/pglab/MainWindow.cpp index e23745e..5410a64 100644 --- a/pglab/MainWindow.cpp +++ b/pglab/MainWindow.cpp @@ -41,7 +41,7 @@ MainWindow::~MainWindow() QueryTab* MainWindow::newSqlPage() { QueryTab *qt = new QueryTab(this); - qt->setConfig(m_config, m_database->catalogue()); + qt->setConfig(m_config, m_database->catalog()); // ui->tabWidget->addTab(qt, "Tab"); // ui->tabWidget->setCurrentWidget(qt); addPage(qt, "Tab"); @@ -62,7 +62,7 @@ void MainWindow::newCrudPage(const PgClass &table) void MainWindow::newCodeGenPage(QString query, std::shared_ptr dbres) { auto cgtab = new CodeGenerator(this); - cgtab->Init(m_database->catalogue(), query, dbres); + cgtab->Init(m_database->catalog(), query, dbres); addPage(cgtab, "Codegen"); } @@ -101,7 +101,7 @@ void MainWindow::catalogLoaded() m_database = loader->GetResult(); auto tt = new TablesPage(this); - tt->setCatalog(m_database->catalogue()); + tt->setCatalog(m_database->catalog()); ui->tabWidget->addTab(tt, "Tables"); ui->tabWidget->setCurrentWidget(tt); diff --git a/pglab/OpenDatabase.cpp b/pglab/OpenDatabase.cpp index 820ff95..55e3dbe 100644 --- a/pglab/OpenDatabase.cpp +++ b/pglab/OpenDatabase.cpp @@ -18,7 +18,7 @@ Expected OpenDatabase::createOpenDatabase(const OpenDatabase::OpenDatabase(const ConnectionConfig& cfg) : m_config(cfg) - , m_catalogue(std::make_shared()) + , m_catalog(std::make_shared()) { } @@ -32,15 +32,15 @@ bool OpenDatabase::Init() auto kw = m_config.getKeywords(); auto vals = m_config.getValues(); if (conn.connect(kw, vals, 0)) { - m_catalogue->loadAll(conn, nullptr); + m_catalog->loadAll(conn, nullptr); return true; } return false; } -std::shared_ptr OpenDatabase::catalogue() +std::shared_ptr OpenDatabase::catalog() { - return m_catalogue; + return m_catalog; } @@ -48,7 +48,7 @@ TypeSelectionItemModel* OpenDatabase::typeSelectionModel() { if (m_typeSelectionModel == nullptr) { m_typeSelectionModel = new TypeSelectionItemModel(nullptr); - m_typeSelectionModel->setTypeList(m_catalogue->types()); + m_typeSelectionModel->setTypeList(m_catalog->types()); } return m_typeSelectionModel; } diff --git a/pglab/OpenDatabase.h b/pglab/OpenDatabase.h index 7e21889..1b4e5ea 100644 --- a/pglab/OpenDatabase.h +++ b/pglab/OpenDatabase.h @@ -23,13 +23,13 @@ public: OpenDatabase& operator=(const OpenDatabase &) = delete; ~OpenDatabase(); - std::shared_ptr catalogue(); + std::shared_ptr catalog(); TypeSelectionItemModel* typeSelectionModel(); const ConnectionConfig& config() const { return m_config; } private: ConnectionConfig m_config; - std::shared_ptr m_catalogue; + std::shared_ptr m_catalog; TypeSelectionItemModel *m_typeSelectionModel = nullptr; diff --git a/pglab/QueryParamListController.cpp b/pglab/QueryParamListController.cpp index b2efb32..564a7d2 100644 --- a/pglab/QueryParamListController.cpp +++ b/pglab/QueryParamListController.cpp @@ -22,7 +22,7 @@ QueryParamListController::QueryParamListController(QTableView *tv, Pgsql::Params QueryParamListController::params() const { Pgsql::Params params; - auto types = m_openDatabase->catalogue()->types(); + auto types = m_openDatabase->catalog()->types(); for (auto e : m_paramList.GetParams()) { Oid oid = types->getByName(e.type)->oid; params.add(e.value, oid); diff --git a/pglab/QueryTab.cpp b/pglab/QueryTab.cpp index f8ac60e..e83b9a8 100644 --- a/pglab/QueryTab.cpp +++ b/pglab/QueryTab.cpp @@ -39,7 +39,7 @@ QueryTab::QueryTab(MainWindow *win, QWidget *parent) : highlighter = new SqlSyntaxHighlighter(ui->queryEdit->document()); auto open_database = m_win->getDatabase(); if (open_database) { - auto cat = open_database->catalogue(); + auto cat = open_database->catalog(); highlighter->setTypes(*cat->types()); } diff --git a/pglab/ServerWindow.cpp b/pglab/ServerWindow.cpp index f8862a2..aaaa4f0 100644 --- a/pglab/ServerWindow.cpp +++ b/pglab/ServerWindow.cpp @@ -30,7 +30,7 @@ void ServerWindow::setConfig(const ConnectionConfig &config) auto res = OpenDatabase::createOpenDatabase(config); if (res.valid()) { m_database = res.get(); - auto cat = m_database->catalogue(); + auto cat = m_database->catalog(); if (cat) { m_databasesModel->setDatabaseList(cat); m_rolesModel->setRoleList(cat->authIds()); diff --git a/pglablib/PgConstraintContainer.cpp b/pglablib/PgConstraintContainer.cpp index 2ebd309..007aee2 100644 --- a/pglablib/PgConstraintContainer.cpp +++ b/pglablib/PgConstraintContainer.cpp @@ -13,7 +13,7 @@ SELECT oid, conname, connamespace, contype, condeferrable, pg_get_constraintdef(oid) FROM pg_constraint)__"; -// auto cat = m_catalogue.lock(); +// auto cat = m_catalog.lock(); // if (cat && cat->serverVersion() >= 90400) // q += ", indisreplident "; // q += "\nFROM pg_index"; diff --git a/pglablib/PgContainer.h b/pglablib/PgContainer.h index cfce31e..82f8bb2 100644 --- a/pglablib/PgContainer.h +++ b/pglablib/PgContainer.h @@ -124,7 +124,7 @@ public: using t_Container = std::vector; ///< Do not assume it will stay a vector only expect bidirectional access explicit PgSPtrContainer(std::weak_ptr cat) - : m_catalogue(cat) + : m_catalog(cat) {} @@ -188,7 +188,7 @@ public: std::sort(m_container.begin(), m_container.end()); } protected: - std::weak_ptr m_catalogue; + std::weak_ptr m_catalog; t_Container m_container; /** Override the implementation for this function to implement loading of single row. diff --git a/pglablib/PgDatabaseContainer.h b/pglablib/PgDatabaseContainer.h index 2105a34..0ccb5ad 100644 --- a/pglablib/PgDatabaseContainer.h +++ b/pglablib/PgDatabaseContainer.h @@ -13,7 +13,7 @@ namespace Pgsql { class PgDatabaseContainer: public PgContainer { public: - //explicit PgDatabaseContainer(PgDatabaseCatalogue *cat); + //explicit PgDatabaseContainer(PgDatabaseCatalog *cat); using PgContainer::PgContainer; virtual std::string getLoadQuery() const override;