Move params.[ch]pp and template.[ch]pp into main src directory

From the "gen" directory. As preparation for using this code in the main
program.

Author: joto

CMakeLists.txt

@@ -266,9 +266,7 @@ else()
                 src/gen/gen-tile-sql.cpp
                 src/gen/gen-tile-vector.cpp
                 src/gen/gen-tile.cpp
-                src/gen/params.cpp
                 src/gen/raster.cpp
-                src/gen/template.cpp
                 src/gen/tracer.cpp)
     target_link_libraries(osm2pgsql-gen osm2pgsql_lib ${LIBS} ${POTRACE_LIBRARY} ${OpenCV_LIBS})
 endif()

src/CMakeLists.txt

@@ -47,6 +47,7 @@ target_sources(osm2pgsql_lib PRIVATE
     output-null.cpp
     output-pgsql.cpp
     output.cpp
+    params.cpp
     pgsql-capabilities.cpp
     pgsql-helper.cpp
     pgsql.cpp
@@ -58,6 +59,7 @@ target_sources(osm2pgsql_lib PRIVATE
     tagtransform-c.cpp
     tagtransform-lua.cpp
     tagtransform.cpp
+    template.cpp
     thread-pool.cpp
     tile.cpp
     util.cpp

src/middle-pgsql.cpp

@@ -42,6 +42,7 @@
 #include "options.hpp"
 #include "osmtypes.hpp"
 #include "pgsql-helper.hpp"
+#include "template.hpp"
 #include "util.hpp"
 
 namespace {
@@ -72,37 +73,44 @@ void load_id_list(pg_conn_t const &db_connection, std::string const &table,
 
 std::string build_sql(options_t const &options, std::string const &templ)
 {
-    std::string const using_tablespace{options.tblsslim_index.empty()
-                                           ? ""
-                                           : "USING INDEX TABLESPACE " +
-                                                 options.tblsslim_index};
-
     std::string const schema = "\"" + options.middle_dbschema + "\".";
 
-    return fmt::format(
-        fmt::runtime(templ), fmt::arg("prefix", options.prefix),
-        fmt::arg("schema", schema),
-        fmt::arg("unlogged", options.droptemp ? "UNLOGGED" : ""),
-        fmt::arg("using_tablespace", using_tablespace),
-        fmt::arg("data_tablespace", tablespace_clause(options.tblsslim_data)),
-        fmt::arg("index_tablespace", tablespace_clause(options.tblsslim_index)),
-        fmt::arg("way_node_index_id_shift", 5),
-        fmt::arg("attribute_columns_definition",
-                 options.extra_attributes ? " created timestamp with time zone,"
-                                            " version int4,"
-                                            " changeset_id int4,"
-                                            " user_id int4,"
-                                          : ""),
-        fmt::arg("attribute_columns_use",
-                 options.extra_attributes
-                     ? ", EXTRACT(EPOCH FROM created) AS created, version, "
-                       "changeset_id, user_id, u.name"
-                     : ""),
-        fmt::arg("users_table_access",
-                 options.extra_attributes
-                     ? "LEFT JOIN " + schema + '"' + options.prefix +
-                           "_users\" u ON o.user_id = u.id"
-                     : ""));
+    params_t params;
+    params.set("prefix", options.prefix);
+    params.set("schema", schema);
+    params.set("unlogged", options.droptemp ? "UNLOGGED" : "");
+    params.set("data_tablespace", tablespace_clause(options.tblsslim_data));
+    params.set("index_tablespace", tablespace_clause(options.tblsslim_index));
+    params.set("way_node_index_id_shift", 5);
+
+    if (options.tblsslim_index.empty()) {
+        params.set("using_tablespace", "");
+    } else {
+        params.set("using_tablespace",
+                   "USING INDEX TABLESPACE " + options.tblsslim_index);
+    }
+
+    if (options.extra_attributes) {
+        params.set("attribute_columns_definition",
+                   " created timestamp with time zone,"
+                   " version int4,"
+                   " changeset_id int4,"
+                   " user_id int4,");
+        params.set("attribute_columns_use",
+                   ", EXTRACT(EPOCH FROM created) AS created, version, "
+                   "changeset_id, user_id, u.name");
+        params.set("users_table_access", "LEFT JOIN " + schema + '"' +
+                                             options.prefix +
+                                             "_users\" u ON o.user_id = u.id");
+    } else {
+        params.set("attribute_columns_definition", "");
+        params.set("attribute_columns_use", "");
+        params.set("users_table_access", "");
+    }
+
+    template_t sql_template{templ};
+    sql_template.set_params(params);
+    return sql_template.render();
 }
 
 std::vector<std::string> build_sql(options_t const &options,