Merge pull request #1197 from joto/fix-update-table-without-geom

Fix in flex output: Updating tables without geometry should work

Author: lonvia

src/output-flex.cpp

@@ -1115,10 +1115,18 @@ void output_flex_t::delete_from_table(table_connection_t *table_connection,
 {
     assert(table_connection);
     auto const id = table_connection->table().map_id(type, osm_id);
-    auto const result = table_connection->get_geom_by_id(type, id);
-    if (m_expire.from_result(result, id) != 0) {
-        table_connection->delete_rows_with(type, id);
+
+    if (table_connection->table().has_geom_column()) {
+        auto const result = table_connection->get_geom_by_id(type, id);
+
+        if (result.num_tuples() == 0) {
+            return;
+        }
+
+        m_expire.from_result(result, id);
     }
+
+    table_connection->delete_rows_with(type, id);
 }
 
 void output_flex_t::delete_from_tables(osmium::item_type type, osmid_t osm_id)

tests/CMakeLists.txt

@@ -78,6 +78,7 @@ if (HAVE_LUA)
     set_test(test-output-flex-extra)
     set_test(test-output-flex-invalid-geom)
     set_test(test-output-flex-lua-fail)
+    set_test(test-output-flex-nogeom)
     set_test(test-output-flex-uni)
     set_test(test-output-flex-tablespace LABELS Tablespace)
     set_test(test-output-flex-types)

tests/data/test_output_flex_nogeom.lua

@@ -0,0 +1,9 @@
+
+local pois = osm2pgsql.define_node_table('osm2pgsql_test_pois', {
+    { column = 'tags',  type = 'hstore' },
+})
+
+function osm2pgsql.process_node(object)
+    pois:add_row{ tags = object.tags }
+end
+

tests/test-output-flex-nogeom.cpp

@@ -0,0 +1,29 @@
+#include <catch.hpp>
+
+#include "common-import.hpp"
+#include "common-options.hpp"
+
+static testing::db::import_t db;
+
+TEST_CASE("updating table without geometry should work")
+{
+    testing::opt_t options = testing::opt_t()
+                                 .slim()
+                                 .flex("test_output_flex_nogeom.lua")
+                                 .srs(PROJ_LATLONG);
+
+    REQUIRE_NOTHROW(db.run_import(options,
+                                  "n10 v1 dV Tamenity=restaurant x10.0 y10.0\n"
+                                  "n11 v1 dV Tamenity=post_box x10.0 y10.2\n"));
+
+    auto conn = db.db().connect();
+
+    CHECK(2 == conn.get_count("osm2pgsql_test_pois"));
+
+    REQUIRE_NOTHROW(db.run_import(
+        options.append(),
+        "n10 v2 dV Tamenity=restaurant,name=Schwanen x10.0 y10.0\n"));
+
+    CHECK(2 == conn.get_count("osm2pgsql_test_pois"));
+}
+