Make conn_t class in tests derive from pg_conn_t

joto · joto · commit a1643d4ba9b8 · 2019-12-10T15:47:07.000+01:00
Simplifies code and tests run on more production code this way.
diff --git a/tests/common-pg.hpp b/tests/common-pg.hpp
@@ -5,8 +5,6 @@
 #include <stdexcept>
 #include <string>
 
-#include <libpq-fe.h>
-
 #include <boost/lexical_cast.hpp>
 
 #include "format.hpp"
@@ -23,51 +21,18 @@
 /// Helper classes for postgres connections
 namespace pg {
 
-class conn_t
+class conn_t : public pg_conn_t
 {
 public:
-    conn_t(char const *conninfo)
-    {
-        m_conn = PQconnectdb(conninfo);
-
-        if (PQstatus(m_conn) != CONNECTION_OK) {
-            fprintf(stderr, "Could not connect to database '%s' because: %s\n",
-                    conninfo, PQerrorMessage(m_conn));
-            PQfinish(m_conn);
-            throw std::runtime_error("Database connection failed");
-        }
-    }
-
-    ~conn_t() noexcept
-    {
-        if (m_conn) {
-            PQfinish(m_conn);
-        }
-    }
-
-    void exec(std::string const &cmd, ExecStatusType expect = PGRES_COMMAND_OK)
-    {
-        pg_result_t res = query(cmd);
-        if (res.status() != expect) {
-            fprintf(stderr, "Query '%s' failed with: %s\n", cmd.c_str(),
-                    PQerrorMessage(m_conn));
-            throw std::runtime_error("DB exec failed.");
-        }
-    }
-
-    pg_result_t query(std::string const &cmd) const
-    {
-        return PQexec(m_conn, cmd.c_str());
-    }
+    conn_t(std::string const &conninfo) : pg_conn_t(conninfo) {}
 
     template <typename T>
     T require_scalar(std::string const &cmd) const
     {
-        pg_result_t res = query(cmd);
-        REQUIRE(res.status() == PGRES_TUPLES_OK);
+        pg_result_t const res = query(PGRES_TUPLES_OK, cmd);
         REQUIRE(res.num_tuples() == 1);
 
-        std::string str = res.get_value(0, 0);
+        std::string const str = res.get_value(0, 0);
         return boost::lexical_cast<T>(str);
     }
 
@@ -78,16 +43,14 @@ class conn_t
 
     void assert_null(std::string const &cmd) const
     {
-        pg_result_t res = query(cmd);
-        REQUIRE(res.status() == PGRES_TUPLES_OK);
+        pg_result_t const res = query(PGRES_TUPLES_OK, cmd);
         REQUIRE(res.num_tuples() == 1);
         REQUIRE(res.is_null(0, 0));
     }
 
     pg_result_t require_row(std::string const &cmd) const
     {
-        pg_result_t res = query(cmd);
-        REQUIRE(res.status() == PGRES_TUPLES_OK);
+        pg_result_t res = query(PGRES_TUPLES_OK, cmd);
         REQUIRE(res.num_tuples() == 1);
 
         return res;
@@ -108,9 +71,6 @@ class conn_t
 
         REQUIRE(get_count("pg_catalog.pg_class", where) == 1);
     }
-
-private:
-    PGconn *m_conn = nullptr;
 };
 
 class tempdb_t
@@ -146,15 +106,15 @@ class tempdb_t
     {
         if (!m_db_name.empty()) {
             try {
-                conn_t conn("dbname=postgres");
-                conn.query("DROP DATABASE IF EXISTS \"{}\""_format(m_db_name));
+                conn_t conn{"dbname=postgres"};
+                conn.exec("DROP DATABASE IF EXISTS \"{}\""_format(m_db_name));
             } catch (...) {
                 fprintf(stderr, "DROP DATABASE failed. Ignored.\n");
             }
         }
     }
 
-    conn_t connect() const { return conn_t(conninfo().c_str()); }
+    conn_t connect() const { return conn_t{conninfo()}; }
 
     std::string conninfo() const { return "dbname=" + m_db_name; }
 
