Adding another exec_prepared() overload for the 2-param case

This allows us to make the original exec_prepared() an internal function
hiding the ugly interface.

Author: joto

src/flex-table.cpp

@@ -309,8 +309,8 @@ pg_result_t table_connection_t::get_geom_by_id(osmium::item_type type,
     assert(m_db_connection);
     std::string const id_str = fmt::to_string(id);
     if (table().has_multicolumn_id_index()) {
-        char const *param_values[] = {type_to_char(type), id_str.c_str()};
-        return m_db_connection->exec_prepared("get_wkb", 2, param_values);
+        return m_db_connection->exec_prepared(
+            "get_wkb", type_to_char(type), id_str.c_str());
     }
     return m_db_connection->exec_prepared("get_wkb", id_str);
 }

src/pgsql.cpp

@@ -3,6 +3,7 @@
 #include "pgsql.hpp"
 #include "util.hpp"
 
+#include <array>
 #include <cstdarg>
 #include <cstdio>
 
@@ -94,8 +95,9 @@ void pg_conn_t::end_copy(std::string const &context) const
     }
 }
 
-pg_result_t pg_conn_t::exec_prepared(char const *stmt, int num_params,
-                                     char const *const *param_values) const
+pg_result_t
+pg_conn_t::exec_prepared_internal(char const *stmt, int num_params,
+                                  char const *const *param_values) const
 {
 #ifdef DEBUG_PGSQL
     fmt::print(stderr, "ExecPrepared: {}\n", stmt);
@@ -119,9 +121,15 @@ pg_result_t pg_conn_t::exec_prepared(char const *stmt, int num_params,
     return res;
 }
 
+pg_result_t pg_conn_t::exec_prepared(char const *stmt, char const *p1, char const *p2) const
+{
+    std::array<const char *, 2> params{p1, p2};
+    return exec_prepared_internal(stmt, params.size(), params.data());
+}
+
 pg_result_t pg_conn_t::exec_prepared(char const *stmt, char const *param) const
 {
-    return exec_prepared(stmt, 1, &param);
+    return exec_prepared_internal(stmt, 1, &param);
 }
 
 pg_result_t pg_conn_t::exec_prepared(char const *stmt,

src/pgsql.hpp

@@ -101,13 +101,16 @@ class pg_conn_t
 public:
     explicit pg_conn_t(std::string const &conninfo);
 
-    pg_result_t exec_prepared(char const *stmt, int num_params,
-                              char const *const *param_values) const;
-
+    /// Execute a prepared statement with one parameter.
     pg_result_t exec_prepared(char const *stmt, char const *param) const;
 
+    /// Execute a prepared statement with two parameters.
+    pg_result_t exec_prepared(char const *stmt, char const *p1, char const *p2) const;
+
+    /// Execute a prepared statement with one string parameter.
     pg_result_t exec_prepared(char const *stmt, std::string const &param) const;
 
+    /// Execute a prepared statement with one integer parameter.
     pg_result_t exec_prepared(char const *stmt, osmid_t id) const;
 
     pg_result_t query(ExecStatusType expect, char const *sql) const;
@@ -128,6 +131,9 @@ class pg_conn_t
     void close() noexcept { m_conn.reset(); }
 
 private:
+    pg_result_t exec_prepared_internal(char const *stmt, int num_params,
+                                       char const *const *param_values) const;
+
     struct pg_conn_deleter_t
     {
         void operator()(PGconn *p) const noexcept { PQfinish(p); }