Move get_ids() helper function from middle into pgsql-helper.cpp

Author: joto

src/middle-pgsql.cpp

@@ -386,25 +386,19 @@ void middle_pgsql_t::node_delete(osmid_t osm_id)
     }
 }
 
-idlist_t middle_pgsql_t::get_ids(const char* stmt, osmid_t osm_id)
-{
-    auto const res = m_db_connection.exec_prepared(stmt, osm_id);
-    return get_ids_from_result(res);
-}
-
 idlist_t middle_pgsql_t::get_ways_by_node(osmid_t osm_id)
 {
-    return get_ids("mark_ways_by_node", osm_id);
+    return get_ids_from_db(&m_db_connection, "mark_ways_by_node", osm_id);
 }
 
 idlist_t middle_pgsql_t::get_rels_by_node(osmid_t osm_id)
 {
-    return get_ids("mark_rels_by_node", osm_id);
+    return get_ids_from_db(&m_db_connection, "mark_rels_by_node", osm_id);
 }
 
 idlist_t middle_pgsql_t::get_rels_by_way(osmid_t osm_id)
 {
-    return get_ids("mark_rels_by_way", osm_id);
+    return get_ids_from_db(&m_db_connection, "mark_rels_by_way", osm_id);
 }
 
 void middle_pgsql_t::way_set(osmium::Way const &way)

src/middle-pgsql.hpp

@@ -128,8 +128,6 @@ struct middle_pgsql_t : public middle_t
 
     void buffer_store_tags(osmium::OSMObject const &obj, bool attrs);
 
-    idlist_t get_ids(const char* stmt, osmid_t osm_id);
-
     table_desc m_tables[NUM_TABLES];
 
     options_t const *m_options;

src/pgsql-helper.cpp

@@ -13,6 +13,13 @@ idlist_t get_ids_from_result(pg_result_t const &result) {
     return ids;
 }
 
+idlist_t get_ids_from_db(pg_conn_t const *db_connection, char const *stmt,
+                         osmid_t id)
+{
+    auto const res = db_connection->exec_prepared(stmt, id);
+    return get_ids_from_result(res);
+}
+
 void create_geom_check_trigger(pg_conn_t *db_connection,
                                std::string const &schema,
                                std::string const &table,

src/pgsql-helper.hpp

@@ -14,6 +14,9 @@
  */
 idlist_t get_ids_from_result(pg_result_t const &result);
 
+idlist_t get_ids_from_db(pg_conn_t const *db_connection, char const *stmt,
+                         osmid_t id);
+
 void create_geom_check_trigger(pg_conn_t *db_connection,
                                std::string const &schema,
                                std::string const &table,