eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Use catalog instead of catalogue consistently

Browse source
This commit is contained in:
eelke 2018-11-25 09:05:01 +01:00
parent 52011a9842
commit 7db859737a
10 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pglab/CrudModel.cpp
View file

@ -38,7 +38,7 @@ void CrudModel::setConfig(std::shared_ptr<OpenDatabase> db, const PgClass &table
{ {
m_database = db; m_database = db;
m_table = table; m_table = table;
m_primaryKey = db->catalogue()->constraints()->getPrimaryForRelation(table.oid); m_primaryKey = db->catalog()->constraints()->getPrimaryForRelation(table.oid);
//cat->attributes()->getColumnsForRelation() //cat->attributes()->getColumnsForRelation()
callLoadData = true; callLoadData = true;
auto dbconfig = m_database->config(); auto dbconfig = m_database->config();
@ -52,7 +52,7 @@ QVariant CrudModel::headerData(int section, Qt::Orientation orientation, int rol
if (orientation == Qt::Horizontal) { if (orientation == Qt::Horizontal) {
QString s(m_roData->getColName(section)); QString s(m_roData->getColName(section));
s += "\n"; s += "\n";
s += getTypeDisplayString(*m_database->catalogue(), getType(section)); s += getTypeDisplayString(*m_database->catalog(), getType(section));
r = s; r = s;
} }
else { else {
@ -163,7 +163,7 @@ QVariant CrudModel::data(const QModelIndex &index, int role) const
void CrudModel::loadData() 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 "; std::string q = "SELECT * FROM ";
q += std::string(table_name.toUtf8().data()); q += std::string(table_name.toUtf8().data());
m_dbConn.send(q, [this] (Expected<std::shared_ptr<Pgsql::Result>> res, qint64) { m_dbConn.send(q, [this] (Expected<std::shared_ptr<Pgsql::Result>> res, qint64) {
@ -295,7 +295,7 @@ std::tuple<QString, Pgsql::Params> CrudModel::createUpdateQuery(const PKeyValues
{ {
Pgsql::Params params; Pgsql::Params params;
auto data = pending_row.data(); 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; QString buffer;
QTextStream q(&buffer); QTextStream q(&buffer);
q << "UPDATE " << table_name << " AS d\n SET "; q << "UPDATE " << table_name << " AS d\n SET ";
@ -329,12 +329,12 @@ std::tuple<QString, Pgsql::Params> CrudModel::createInsertQuery(const PendingRow
{ {
Pgsql::Params params; Pgsql::Params params;
auto data = pending_row.data(); 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; QString buffer;
QTextStream q(&buffer); QTextStream q(&buffer);
q << "INSERT INTO " << table_name << "("; 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; bool first = true;
for (auto e : data) { for (auto e : data) {
int num = e.first + 1; int num = e.first + 1;
@ -362,7 +362,7 @@ std::tuple<QString, Pgsql::Params> CrudModel::createInsertQuery(const PendingRow
std::tuple<QString, Pgsql::Params> CrudModel::createDeleteStatement(const PKeyValues &pkey_values) std::tuple<QString, Pgsql::Params> CrudModel::createDeleteStatement(const PKeyValues &pkey_values)
{ {
Pgsql::Params params; Pgsql::Params params;
QString table_name = genFQTableName(*m_database->catalogue(), m_table); QString table_name = genFQTableName(*m_database->catalog(), m_table);
QString buffer; QString buffer;
QTextStream q(&buffer); QTextStream q(&buffer);
q << "DELETE FROM " << table_name; q << "DELETE FROM " << table_name;

6
pglab/MainWindow.cpp
View file

@ -41,7 +41,7 @@ MainWindow::~MainWindow()
QueryTab* MainWindow::newSqlPage() QueryTab* MainWindow::newSqlPage()
{ {
QueryTab *qt = new QueryTab(this); 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->addTab(qt, "Tab");
// ui->tabWidget->setCurrentWidget(qt); // ui->tabWidget->setCurrentWidget(qt);
addPage(qt, "Tab"); addPage(qt, "Tab");
@ -62,7 +62,7 @@ void MainWindow::newCrudPage(const PgClass &table)
void MainWindow::newCodeGenPage(QString query, std::shared_ptr<const Pgsql::Result> dbres) void MainWindow::newCodeGenPage(QString query, std::shared_ptr<const Pgsql::Result> dbres)
{ {
auto cgtab = new CodeGenerator(this); auto cgtab = new CodeGenerator(this);
cgtab->Init(m_database->catalogue(), query, dbres); cgtab->Init(m_database->catalog(), query, dbres);
addPage(cgtab, "Codegen"); addPage(cgtab, "Codegen");
} }
@ -101,7 +101,7 @@ void MainWindow::catalogLoaded()
m_database = loader->GetResult(); m_database = loader->GetResult();
auto tt = new TablesPage(this); auto tt = new TablesPage(this);
tt->setCatalog(m_database->catalogue()); tt->setCatalog(m_database->catalog());
ui->tabWidget->addTab(tt, "Tables"); ui->tabWidget->addTab(tt, "Tables");
ui->tabWidget->setCurrentWidget(tt); ui->tabWidget->setCurrentWidget(tt);

10
pglab/OpenDatabase.cpp
View file

@ -18,7 +18,7 @@ Expected<OpenDatabase::OpenDatabaseSPtr> OpenDatabase::createOpenDatabase(const
OpenDatabase::OpenDatabase(const ConnectionConfig& cfg) OpenDatabase::OpenDatabase(const ConnectionConfig& cfg)
: m_config(cfg) : m_config(cfg)
, m_catalogue(std::make_shared<PgDatabaseCatalog>()) , m_catalog(std::make_shared<PgDatabaseCatalog>())
{ {
} }
@ -32,15 +32,15 @@ bool OpenDatabase::Init()
auto kw = m_config.getKeywords(); auto kw = m_config.getKeywords();
auto vals = m_config.getValues(); auto vals = m_config.getValues();
if (conn.connect(kw, vals, 0)) { if (conn.connect(kw, vals, 0)) {
m_catalogue->loadAll(conn, nullptr); m_catalog->loadAll(conn, nullptr);
return true; return true;
} }
return false; return false;
} }
std::shared_ptr<PgDatabaseCatalog> OpenDatabase::catalogue() std::shared_ptr<PgDatabaseCatalog> OpenDatabase::catalog()
{ {
return m_catalogue; return m_catalog;
} }
@ -48,7 +48,7 @@ TypeSelectionItemModel* OpenDatabase::typeSelectionModel()
{ {
if (m_typeSelectionModel == nullptr) { if (m_typeSelectionModel == nullptr) {
m_typeSelectionModel = new TypeSelectionItemModel(nullptr); m_typeSelectionModel = new TypeSelectionItemModel(nullptr);
m_typeSelectionModel->setTypeList(m_catalogue->types()); m_typeSelectionModel->setTypeList(m_catalog->types());
} }
return m_typeSelectionModel; return m_typeSelectionModel;
} }

4
pglab/OpenDatabase.h
View file

@ -23,13 +23,13 @@ public:
OpenDatabase& operator=(const OpenDatabase &) = delete; OpenDatabase& operator=(const OpenDatabase &) = delete;
~OpenDatabase(); ~OpenDatabase();
std::shared_ptr<PgDatabaseCatalog> catalogue(); std::shared_ptr<PgDatabaseCatalog> catalog();
TypeSelectionItemModel* typeSelectionModel(); TypeSelectionItemModel* typeSelectionModel();
const ConnectionConfig& config() const { return m_config; } const ConnectionConfig& config() const { return m_config; }
private: private:
ConnectionConfig m_config; ConnectionConfig m_config;
std::shared_ptr<PgDatabaseCatalog> m_catalogue; std::shared_ptr<PgDatabaseCatalog> m_catalog;
TypeSelectionItemModel *m_typeSelectionModel = nullptr; TypeSelectionItemModel *m_typeSelectionModel = nullptr;

2
pglab/QueryParamListController.cpp
View file

@ -22,7 +22,7 @@ QueryParamListController::QueryParamListController(QTableView *tv,
Pgsql::Params QueryParamListController::params() const Pgsql::Params QueryParamListController::params() const
{ {
Pgsql::Params params; Pgsql::Params params;
auto types = m_openDatabase->catalogue()->types(); auto types = m_openDatabase->catalog()->types();
for (auto e : m_paramList.GetParams()) { for (auto e : m_paramList.GetParams()) {
Oid oid = types->getByName(e.type)->oid; Oid oid = types->getByName(e.type)->oid;
params.add(e.value, oid); params.add(e.value, oid);

2
pglab/QueryTab.cpp
View file

@ -39,7 +39,7 @@ QueryTab::QueryTab(MainWindow *win, QWidget *parent) :
highlighter = new SqlSyntaxHighlighter(ui->queryEdit->document()); highlighter = new SqlSyntaxHighlighter(ui->queryEdit->document());
auto open_database = m_win->getDatabase(); auto open_database = m_win->getDatabase();
if (open_database) { if (open_database) {
auto cat = open_database->catalogue(); auto cat = open_database->catalog();
highlighter->setTypes(*cat->types()); highlighter->setTypes(*cat->types());
} }

2
pglab/ServerWindow.cpp
View file

@ -30,7 +30,7 @@ void ServerWindow::setConfig(const ConnectionConfig &config)
auto res = OpenDatabase::createOpenDatabase(config); auto res = OpenDatabase::createOpenDatabase(config);
if (res.valid()) { if (res.valid()) {
m_database = res.get(); m_database = res.get();
auto cat = m_database->catalogue(); auto cat = m_database->catalog();
if (cat) { if (cat) {
m_databasesModel->setDatabaseList(cat); m_databasesModel->setDatabaseList(cat);
m_rolesModel->setRoleList(cat->authIds()); m_rolesModel->setRoleList(cat->authIds());

2
pglablib/PgConstraintContainer.cpp
View file

@ -13,7 +13,7 @@ SELECT oid, conname, connamespace, contype, condeferrable,
pg_get_constraintdef(oid) pg_get_constraintdef(oid)
FROM pg_constraint)__"; FROM pg_constraint)__";
// auto cat = m_catalogue.lock(); // auto cat = m_catalog.lock();
// if (cat && cat->serverVersion() >= 90400) // if (cat && cat->serverVersion() >= 90400)
// q += ", indisreplident "; // q += ", indisreplident ";
// q += "\nFROM pg_index"; // q += "\nFROM pg_index";

4
pglablib/PgContainer.h
View file

@ -124,7 +124,7 @@ public:
using t_Container = std::vector<t_Elem>; ///< Do not assume it will stay a vector only expect bidirectional access using t_Container = std::vector<t_Elem>; ///< Do not assume it will stay a vector only expect bidirectional access
explicit PgSPtrContainer(std::weak_ptr<PgDatabaseCatalog> cat) explicit PgSPtrContainer(std::weak_ptr<PgDatabaseCatalog> cat)
: m_catalogue(cat) : m_catalog(cat)
{} {}
@ -188,7 +188,7 @@ public:
std::sort(m_container.begin(), m_container.end()); std::sort(m_container.begin(), m_container.end());
} }
protected: protected:
std::weak_ptr<PgDatabaseCatalog> m_catalogue; std::weak_ptr<PgDatabaseCatalog> m_catalog;
t_Container m_container; t_Container m_container;
/** Override the implementation for this function to implement loading of single row. /** Override the implementation for this function to implement loading of single row.

2
pglablib/PgDatabaseContainer.h
View file

@ -13,7 +13,7 @@ namespace Pgsql {
class PgDatabaseContainer: public PgContainer<PgDatabase> { class PgDatabaseContainer: public PgContainer<PgDatabase> {
public: public:
//explicit PgDatabaseContainer(PgDatabaseCatalogue *cat); //explicit PgDatabaseContainer(PgDatabaseCatalog *cat);
using PgContainer<PgDatabase>::PgContainer; using PgContainer<PgDatabase>::PgContainer;
virtual std::string getLoadQuery() const override; virtual std::string getLoadQuery() const override;