From ecae0464f95e0d4585fb78f4a6a559fa701817ce Mon Sep 17 00:00:00 2001
From: eelke <eelke@eelkeklein.nl>
Date: Tue, 29 Jan 2019 19:41:27 +0100
Subject: [PATCH] Fix: openening not accessible database crashes program.

OpenDatabase::createOpenDatabase now uses QException derived exception to report failure.
This makes it possible to catch the exception in a background thread and rethrow it when the Future is read.
Which makes it possible for the database window to properly report the problem.
---
 pglab/DatabaseWindow.cpp |  6 +++---
 pglab/DatabaseWindow.h   |  3 +--
 pglab/OpenDatabase.cpp   | 23 ++++++++++-------------
 pglab/OpenDatabase.h     | 18 ++++++++++++++++--
 pglab/ServerWindow.cpp   | 10 ++++++----
 5 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/pglab/DatabaseWindow.cpp b/pglab/DatabaseWindow.cpp
index 4a06812..caa5a1f 100644
--- a/pglab/DatabaseWindow.cpp
+++ b/pglab/DatabaseWindow.cpp
@@ -1,6 +1,7 @@
 #include "DatabaseWindow.h"
 #include "plugin_support/IPluginContentWidgetContext.h"
 #include "util.h"
+#include "OpenDatabase.h"
 #include "MasterController.h"
 #include "TaskExecutor.h"
 #include <QApplication>
@@ -84,9 +85,8 @@ void DatabaseWindow::catalogLoaded()
 		m_tabWidget->addTab(sequences_page, "Sequences");
 
 		newCreateTablePage();
-	} catch (std::runtime_error &ex) {
-		QMessageBox::critical(this, "Error reading database",
-							  QString::fromUtf8(ex.what()));
+	} catch (const OpenDatabaseException &ex) {
+		QMessageBox::critical(this, "Error reading database", ex.text());
 
 		close();
 	}
diff --git a/pglab/DatabaseWindow.h b/pglab/DatabaseWindow.h
index ee748bb..cd14cf4 100644
--- a/pglab/DatabaseWindow.h
+++ b/pglab/DatabaseWindow.h
@@ -51,8 +51,7 @@ private:
 
 		OpenDatabase::OpenDatabaseSPtr run(TaskControl& ) override
 		{
-			auto res = OpenDatabase::createOpenDatabase(m_config);
-			return res.get();
+			return OpenDatabase::createOpenDatabase(m_config);
 		}
 
 	private:
diff --git a/pglab/OpenDatabase.cpp b/pglab/OpenDatabase.cpp
index fa349f9..e5fd86f 100644
--- a/pglab/OpenDatabase.cpp
+++ b/pglab/OpenDatabase.cpp
@@ -1,22 +1,19 @@
 #include "OpenDatabase.h"
 #include "catalog/PgDatabaseCatalog.h"
 #include "Pgsql_Connection.h"
+#include "Pgsql_PgException.h"
 #include "model/TypeSelectionItemModel.h"
 
-Expected<OpenDatabase::OpenDatabaseSPtr> OpenDatabase::createOpenDatabase(const ConnectionConfig &cfg)
+OpenDatabase::OpenDatabaseSPtr OpenDatabase::createOpenDatabase(const ConnectionConfig &cfg)
 {
-	return Expected<OpenDatabase::OpenDatabaseSPtr>::fromCode(
-		[&cfg] () -> auto {
-			OpenDatabaseSPtr odb(new OpenDatabase(cfg));
-			odb->Init();
-			return odb;
-		});
-//	catch (const PgException &ex) {
-//		return
-//	}
-
-//	return Expected<OpenDatabaseSPtr>::fromException(
-//        std::runtime_error("Failed to get database information"));
+	try {
+		OpenDatabaseSPtr odb(new OpenDatabase(cfg));
+		odb->Init();
+		return odb;
+	}
+	catch (const Pgsql::PgException &ex) {
+		throw OpenDatabaseException(ex.what());
+	}
 }
 
 OpenDatabase::OpenDatabase(const ConnectionConfig& cfg)
diff --git a/pglab/OpenDatabase.h b/pglab/OpenDatabase.h
index 93ac6a2..41e4287 100644
--- a/pglab/OpenDatabase.h
+++ b/pglab/OpenDatabase.h
@@ -2,19 +2,33 @@
 #define OPENDATABASE_H
 
 #include "ConnectionConfig.h"
-#include "Expected.h"
+#include <QException>
 #include <memory>
 
 class PgDatabaseCatalog;
 class TypeSelectionItemModel;
 
+class OpenDatabaseException : public QException {
+public:
+	OpenDatabaseException(QString message)
+		: m_message(std::move(message))
+	{}
+
+	QString text() const { return m_message; }
+
+	void raise() const override { throw *this; }
+	OpenDatabaseException *clone() const override { return new OpenDatabaseException(*this); }
+private:
+	QString m_message;
+};
+
 /** Instances of this class represent a single database on which atleast one
  * window is opened. This class is used to track details about that database.
  */
 class OpenDatabase {
 public:
 	using OpenDatabaseSPtr = std::shared_ptr<OpenDatabase>;
-	static Expected<OpenDatabaseSPtr> createOpenDatabase(const ConnectionConfig &cfg);
+	static OpenDatabaseSPtr createOpenDatabase(const ConnectionConfig &cfg);
 
 //	using on_createResult_callback = std::function<void(Expected<std::shared_ptr<Pgsql::Result>>)>;
 //	void asyncCreateOpenDatabase(const ConnectionConfig &cfg, on_createResult_callback);
diff --git a/pglab/ServerWindow.cpp b/pglab/ServerWindow.cpp
index 31cb27e..52267da 100644
--- a/pglab/ServerWindow.cpp
+++ b/pglab/ServerWindow.cpp
@@ -4,6 +4,7 @@
 #include "DatabasesTableModel.h"
 #include "RolesTableModel.h"
 #include "catalog/PgDatabaseCatalog.h"
+#include <QDebug>
 
 ServerWindow::ServerWindow(MasterController *master, QWidget *parent)
 	: QMainWindow(parent)
@@ -27,17 +28,18 @@ ServerWindow::~ServerWindow()
 void ServerWindow::setConfig(const ConnectionConfig &config)
 {
 	m_config = config;
-	auto res = OpenDatabase::createOpenDatabase(config);
-	if (res.valid()) {
-		m_database = res.get();
+	try {
+		m_database = OpenDatabase::createOpenDatabase(config);
 		auto cat = m_database->catalog();
 		if (cat) {
 			m_databasesModel->setDatabaseList(cat);
 			m_rolesModel->setRoleList(cat->authIds());
 		}
 	}
+	catch (const OpenDatabaseException &ex) {
+		qWarning() << ex.text();
+	}
 	QString title = "pglab - ";
 	title += m_config.name().c_str();
 	setWindowTitle(title);
-//	newSqlPage();
 }