Change handling of libpqxx classes to support version 7.

pqxx::connection::activate() and pqxx::connection::disconnect() are gone,
the former doesn't have a corresponding substitute. Instead the caller is
encouraged to watch out for broken_connection exception. Also the explicit
activation of a PostgreSQL connection is no longer supported.

work::prepared() is also no longer supported, so change this to
work::exec_prepared(). There's no need to special case this for older libpqxx
versions, since this method is already present there, too.

This commit wraps those deprecated API calls into a ifdef to support
builds with an older libpqxx version. We might get rid of this if we don't want
to have support for those older ones.

Author: psoo

configure.ac

@@ -14,6 +14,7 @@ PKG_CHECK_MODULES(LIBPQXX, libpqxx < 7.0,
          )]
 )
 
+AS_IF([test "x$libpqxx7" = "xyes"], AC_MSG_NOTICE([libpqxx version >= 7 detected]), [])
 AS_IF([test "x$libpqxx7" = "xyes"], [AC_DEFINE([HAVE_LIBPQXX7], [1], [define if libpqxx >= 7 is used])], [])
 AS_IF([test "x$libpqxx7" = "xyes"], [AX_CXX_COMPILE_STDCXX_17(noext,mandatory)], [])
 

log.cc

@@ -146,7 +146,7 @@ pqxx_logger::pqxx_logger(std::string target, std::string conninfo, struct schema
   ostringstream seed;
   seed << smith::rng;
 
-  result r = w.prepared("instance")(GITREV)(target)(hostname)(s.version)(seed.str()).exec();
+  result r = w.exec_prepared("instance", GITREV, target, hostname, s.version, seed.str());
 
   id = r[0][0].as<long>(id);
 
@@ -169,7 +169,7 @@ void pqxx_logger::error(prod &query, const dut::failure &e)
   work w(*c);
   ostringstream s;
   s << query;
-  w.prepared("error")(e.what())(s.str())(e.sqlstate).exec();
+  w.exec_prepared("error", e.what(), s.str(), e.sqlstate);
   w.commit();
 }
 
@@ -180,7 +180,7 @@ void pqxx_logger::generated(prod &query)
     work w(*c);
     ostringstream s;
     impedance::report(s);
-    w.prepared("stat")(queries)(sum_height/queries)(sum_nodes/queries)(sum_retries/queries)(s.str()).exec();
+    w.exec_prepared("stat", queries, sum_height/queries, sum_nodes/queries, sum_retries/queries, s.str());
     w.commit();
   }
 }

postgres.cc

@@ -71,8 +71,10 @@ dut_pqxx::dut_pqxx(std::string conninfo)
 void dut_pqxx::test(const std::string &stmt)
 {
   try {
+#ifndef HAVE_LIBPQXX7
     if(!c.is_open())
        c.activate();
+#endif
 
     pqxx::work w(c);
     w.exec(stmt.c_str());
@@ -282,7 +284,11 @@ schema_pqxx::schema_pqxx(std::string &conninfo, bool no_catalog) : c(conninfo)
     }
   }
   cerr << "done." << endl;
+#ifdef HAVE_LIBPQXX7
+  c.close();
+#else
   c.disconnect();
+#endif
   generate_indexes();
 }