Improved error reporting.

src/pglab/ASyncDBConnection.cpp

@@ -148,6 +148,7 @@ void ASyncDBConnection::async_query_handler(boost::system::error_code ec, std::s
         }
         else {
             // error during consume
+            auto error_msg = m_connection.getErrorMessage();
             
         }
         //return finished;

src/pglab/ASyncDBConnection.h

@@ -6,6 +6,7 @@
 #include "Pgsql_Connection.h"
 #include "Pgsql_Params.h"
 #include "Pgsql_Result.h"
+#include "Expected.h"
 #include "ConnectionConfig.h"
 #include <QElapsedTimer>
 #include <mutex>
@@ -29,7 +30,7 @@ public:
 		Terminating ///< shutting down
 	};
 
-	using on_result_callback = std::function<void(std::shared_ptr<Pgsql::Result>, qint64)>;
+	using on_result_callback = std::function<void(Expected<std::shared_ptr<Pgsql::Result>>, qint64)>;
 
 	explicit ASyncDBConnection(boost::asio::io_service &ios);
     ~ASyncDBConnection();

src/pglab/QueryTab.cpp

@@ -205,14 +205,14 @@ void QueryTab::execute()
         
         if (m_queryParamListController->empty())
             m_dbConnection.send(cmd,
-                [this](std::shared_ptr<Pgsql::Result> res, qint64 elapsedms)
+                [this](Expected<std::shared_ptr<Pgsql::Result>> res, qint64 elapsedms)
                 {
                     m_win->QueueTask([this, res, elapsedms]() { query_ready(res, elapsedms); });
                 });
         else 
             m_dbConnection.send(cmd,
                 m_queryParamListController->params(),
-                [this](std::shared_ptr<Pgsql::Result> res, qint64 elapsedms)
+                [this](Expected<std::shared_ptr<Pgsql::Result>> res, qint64 elapsedms)
                 {
                     m_win->QueueTask([this, res, elapsedms]() { query_ready(res, elapsedms); });
                 });
@@ -234,10 +234,11 @@ void QueryTab::explain(bool analyze)
 	m_stopwatch.start();
 	std::string cmd = "EXPLAIN (" + analyze_str + "VERBOSE, BUFFERS, FORMAT JSON) " + getCommand();
 	m_dbConnection.send(cmd,
-		[this](std::shared_ptr<Pgsql::Result> res, qint64 )
+		[this](Expected<std::shared_ptr<Pgsql::Result>> exp_res, qint64 )
 		{
-			if (res) {
+			if (exp_res.valid()) {
 				// Process explain data seperately
+                auto res = exp_res.get();
 				std::thread([this,res]()
 				{
 					std::shared_ptr<ExplainRoot> explain;
@@ -299,15 +300,14 @@ bool QueryTab::saveSqlTo(const QString &filename)
 		QString text = ui->queryEdit->toPlainText();
 		stream << text;
 /*
-
-
 		QTextDocument *doc = ui->queryEdit->document();
 		QTextBlock block = doc->firstBlock();
 		while (stream.status() == QTextStream::Ok && block.isValid()) {
 			QString plain = block.text();
 			stream << plain << "\n";
 			block = block.next();
-		}*/
+		}
+*/
 
 		stream.flush();
 		if (stream.status() == QTextStream::Ok) {
@@ -483,8 +483,10 @@ void QueryTab::setTabCaption(const QString &caption, const QString &tooltip)
 
 }
 
-void QueryTab::query_ready(std::shared_ptr<Pgsql::Result> dbres, qint64 elapsedms)
+void QueryTab::query_ready(Expected<std::shared_ptr<Pgsql::Result>> exp_res, qint64 elapsedms)
 {
+    if (exp_res.valid()) {
+        auto dbres = exp_res.get();
         if (dbres) {
             addLog("query_ready with result");
             auto st = dbres->resultStatus();
@@ -555,6 +557,10 @@ void QueryTab::query_ready(std::shared_ptr<Pgsql::Result> dbres, qint64 elapsedm
             addLog("query_ready with NO result");
         }
     }
+    else {
+            // we have an error
+    }
+}
 
 void QueryTab::clearResult()
 {

src/pglab/QueryTab.h

@@ -105,7 +105,7 @@ private:
 
 	std::string getCommand() const;
 	void explain_ready(ExplainRoot::SPtr explain);
-	void query_ready(std::shared_ptr<Pgsql::Result> dbres, qint64 elapsedms);
+	void query_ready(Expected<std::shared_ptr<Pgsql::Result>> dbres, qint64 elapsedms);
 
 	QTabWidget *getTabWidget();
 	void setTabCaption(const QString &caption, const QString &tooltip);