summaryrefslogtreecommitdiff
path: root/lib/output/pq/pqConn.cpp
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2021-06-12 20:54:28 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2021-06-12 20:54:28 +0100
commitafd243cc87827c94f0cea73748ffc5c1fdf1880a (patch)
treead3f9c39902a78026b24d9a32e8baf6ff2858281 /lib/output/pq/pqConn.cpp
parentCreate a basic MySQL testing database class (diff)
downloadmygrate-afd243cc87827c94f0cea73748ffc5c1fdf1880a.tar.bz2
mygrate-afd243cc87827c94f0cea73748ffc5c1fdf1880a.tar.xz
mygrate-afd243cc87827c94f0cea73748ffc5c1fdf1880a.zip
Avoid direct use of runtime_error in PostgreSQL stuff
Adds proper exception which extends it and gets the PostgreSQL error message.
Diffstat (limited to 'lib/output/pq/pqConn.cpp')
-rw-r--r--lib/output/pq/pqConn.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/output/pq/pqConn.cpp b/lib/output/pq/pqConn.cpp
index b3a6ca6..c1a7362 100644
--- a/lib/output/pq/pqConn.cpp
+++ b/lib/output/pq/pqConn.cpp
@@ -10,9 +10,14 @@
#include <vector>
namespace MyGrate::Output::Pq {
+ PqErr::PqErr(const std::string & when, PGconn * c) : std::runtime_error(when + ": " + PQerrorMessage((c))) { }
+ PqErr::PqErr(const std::string & when, PGresult * r) : std::runtime_error(when + ": " + PQresultErrorMessage((r)))
+ {
+ }
+
PqConn::PqConn(const char * const str) : conn {PQconnectdb(str), PQfinish}
{
- verify<std::runtime_error>(PQstatus(conn.get()) == CONNECTION_OK, "Connection failure");
+ verify<PqErr>(PQstatus(conn.get()) == CONNECTION_OK, "Connection failure", conn.get());
PQsetNoticeProcessor(conn.get(), notice_processor, this);
}
@@ -20,7 +25,7 @@ namespace MyGrate::Output::Pq {
PqConn::query(const char * const q)
{
ResPtr res {PQexec(conn.get(), q), &PQclear};
- verify<std::runtime_error>(PQresultStatus(res.get()) == PGRES_COMMAND_OK, q);
+ verify<PqErr>(PQresultStatus(res.get()) == PGRES_COMMAND_OK, q, res.get());
}
void
@@ -29,7 +34,7 @@ namespace MyGrate::Output::Pq {
Bindings b {vs};
ResPtr res {PQexecParams(conn.get(), q, (int)vs.size(), nullptr, b.values.data(), b.lengths.data(), nullptr, 0),
&PQclear};
- verify<std::runtime_error>(PQresultStatus(res.get()) == PGRES_COMMAND_OK, q);
+ verify<PqErr>(PQresultStatus(res.get()) == PGRES_COMMAND_OK, q, res.get());
}
DbPrepStmtPtr