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

Fixed some cases where nullptr were not correctly handled.

Browse source
This commit is contained in:
Eelke Klein 2017-09-01 21:07:37 +02:00
parent e66326472e
commit aa50d3097e
3 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pglab/MainWindow.h
View file

@ -41,7 +41,7 @@ private:
Ui::MainWindow *ui; Ui::MainWindow *ui;
ConnectionConfig m_config; ConnectionConfig m_config;
OpenDatabase *m_database; OpenDatabase *m_database = nullptr;
MasterController *m_masterController; MasterController *m_masterController;

7
src/pglab/OpenDatabase.cpp
View file

@ -8,10 +8,12 @@ Expected<OpenDatabase*> OpenDatabase::createOpenDatabase(const ConnectionConfig
OpenDatabase *odb = new OpenDatabase(cfg, nullptr); OpenDatabase *odb = new OpenDatabase(cfg, nullptr);
if (odb->Init()) { if (odb->Init()) {
return odb;
} }
return odb;
//return Expected<ConnectionConfig>::fromException(std::out_of_range("Invalid row")); //return Expected<ConnectionConfig>::fromException(std::out_of_range("Invalid row"));
return Expected<OpenDatabase*>::fromException(
std::runtime_error("Failed to get database information"));
} }
OpenDatabase::OpenDatabase(const ConnectionConfig& cfg, QObject *parent) OpenDatabase::OpenDatabase(const ConnectionConfig& cfg, QObject *parent)
@ -33,8 +35,9 @@ bool OpenDatabase::Init()
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); m_catalogue->loadAll(conn);
}
return true; return true;
}
return false;
} }
PgDatabaseCatalogue* OpenDatabase::catalogue() PgDatabaseCatalogue* OpenDatabase::catalogue()

15
src/pglab/QueryTab.cpp
View file

@ -27,7 +27,9 @@ QueryParamListController::QueryParamListController(QTableView *tv,
, paramTableView(tv) , paramTableView(tv)
, m_openDatabase(opendb) , m_openDatabase(opendb)
{ {
if (opendb) {
m_typeDelegate.setTypeSelectionModel(opendb->typeSelectionModel()); m_typeDelegate.setTypeSelectionModel(opendb->typeSelectionModel());
}
paramTableView->setModel(&m_paramList); paramTableView->setModel(&m_paramList);
paramTableView->setItemDelegateForColumn(1, &m_typeDelegate); paramTableView->setItemDelegateForColumn(1, &m_typeDelegate);
@ -82,17 +84,20 @@ QueryTab::QueryTab(MainWindow *win, QWidget *parent) :
font.setPointSize(10); font.setPointSize(10);
ui->queryEdit->setFont(font); ui->queryEdit->setFont(font);
OpenDatabase* open_database = m_win->getDatabase();
auto cat = open_database->catalogue();
highlighter = new SqlSyntaxHighlighter(ui->queryEdit->document()); highlighter = new SqlSyntaxHighlighter(ui->queryEdit->document());
OpenDatabase* open_database = m_win->getDatabase();
if (open_database) {
auto cat = open_database->catalogue();
highlighter->setTypes(cat->types()); highlighter->setTypes(cat->types());
}
connect(ui->queryEdit, &QPlainTextEdit::textChanged, this, &QueryTab::queryTextChanged); connect(ui->queryEdit, &QPlainTextEdit::textChanged, this, &QueryTab::queryTextChanged);
m_queryParamListController = new QueryParamListController(ui->paramTableView, open_database, this); m_queryParamListController = new QueryParamListController(ui->paramTableView, open_database, this);
connect(ui->addButton, &QPushButton::clicked, m_queryParamListController, &QueryParamListController::on_addParam); connect(ui->addButton, &QPushButton::clicked, m_queryParamListController,
connect(ui->removeButton, &QPushButton::clicked, m_queryParamListController, &QueryParamListController::on_removeParam); &QueryParamListController::on_addParam);
connect(ui->removeButton, &QPushButton::clicked, m_queryParamListController,
&QueryParamListController::on_removeParam);
} }
QueryTab::~QueryTab() QueryTab::~QueryTab()