Bugfix: Flex backend tables w/o geometry were unlogged

Fixes #1141

Author: joto

flex-config/geometries.lua

@@ -45,6 +45,12 @@ tables.boundaries = osm2pgsql.define_relation_table('boundaries', {
     { column = 'geom', type = 'multilinestring' },
 })
 
+-- Tables don't have to have a geometry column. This one will only collect
+-- all the names of pubs but without any location information.
+tables.pubs = osm2pgsql.define_node_table('pubs', {
+    { column = 'name', type = 'text' }
+})
+
 -- Helper function to remove some of the tags we usually are not interested in.
 -- Returns true if there are no tags left.
 function clean_tags(tags)
@@ -105,6 +111,12 @@ function osm2pgsql.process_node(object)
     tables.pois:add_row({
         tags = object.tags
     })
+
+    if object.tags.amenity == 'pub' then
+        tables.pubs:add_row({
+            name = object.tags.name
+        })
+    end
 end
 
 function osm2pgsql.process_way(object)

src/flex-table.cpp

@@ -89,13 +89,13 @@ std::string flex_table_t::build_sql_prepare_get_wkb() const
     return "PREPARE get_wkb(bigint) AS SELECT ''";
 }
 
-std::string flex_table_t::build_sql_create_table(bool final_table) const
+std::string flex_table_t::build_sql_create_table(table_type ttype,
+                                                 std::string const &table_name) const
 {
     assert(!m_columns.empty());
 
     std::string sql = "CREATE {} TABLE IF NOT EXISTS {} ("_format(
-        final_table ? "" : "UNLOGGED",
-        final_table ? full_tmp_name() : full_name());
+        ttype == table_type::interim ? "UNLOGGED" : "", table_name);
 
     for (auto const &column : m_columns) {
         sql += column.sql_create(m_srid);
@@ -104,7 +104,7 @@ std::string flex_table_t::build_sql_create_table(bool final_table) const
     assert(sql.back() == ',');
     sql.back() = ')';
 
-    if (!final_table) {
+    if (ttype == table_type::interim) {
         sql += " WITH (autovacuum_enabled = off)";
     }
 
@@ -166,7 +166,11 @@ void table_connection_t::start(bool append)
             m_db_connection->exec(
                 "CREATE SCHEMA IF NOT EXISTS \"{}\""_format(table().schema()));
         }
-        m_db_connection->exec(table().build_sql_create_table(false));
+
+        m_db_connection->exec(table().build_sql_create_table(
+            table().has_geom_column() ? flex_table_t::table_type::interim
+                                      : flex_table_t::table_type::permanent,
+            table().full_name()));
     } else {
         //check the columns against those in the existing table
         auto const res = m_db_connection->query(
@@ -212,7 +216,8 @@ void table_connection_t::stop(bool updateable, bool append)
         // because they say nothing about the validity of the geometry in OSM.
         m_db_connection->exec("SET client_min_messages = WARNING");
 
-        m_db_connection->exec(table().build_sql_create_table(true));
+        m_db_connection->exec(table().build_sql_create_table(
+            flex_table_t::table_type::permanent, table().full_tmp_name()));
 
         std::string sql = "INSERT INTO {} SELECT * FROM {}"_format(
             table().full_tmp_name(), table().full_name());

src/flex-table.hpp

@@ -21,6 +21,16 @@ class flex_table_t
 {
 
 public:
+
+    /**
+     * Table creation type: interim tables are created as UNLOGGED and with
+     * autovacuum disabled.
+     */
+    enum class table_type {
+        interim,
+        permanent
+    };
+
     flex_table_t(std::string const &name, int srid) : m_name(name), m_srid(srid)
     {}
 
@@ -91,7 +101,8 @@ class flex_table_t
 
     std::string build_sql_prepare_get_wkb() const;
 
-    std::string build_sql_create_table(bool final_table) const;
+    std::string build_sql_create_table(table_type ttype,
+                                       std::string const &table_name) const;
 
     std::string build_sql_column_list() const;