Allow table inserts without context object

src/output-flex.cpp

@@ -735,29 +735,32 @@ bool output_flex_t::relation_cache_t::add_members(middle_query_t const &middle)
     return true;
 }
 
-osmium::OSMObject const &
+osmium::OSMObject const *
 output_flex_t::check_and_get_context_object(flex_table_t const &table)
 {
     if (m_calling_context == calling_context::process_node) {
         if (!table.matches_type(osmium::item_type::node)) {
             throw fmt_error("Trying to add node to table '{}'.", table.name());
         }
-        return *m_context_node;
+        return m_context_node;
     }
 
     if (m_calling_context == calling_context::process_way) {
         if (!table.matches_type(osmium::item_type::way)) {
             throw fmt_error("Trying to add way to table '{}'.", table.name());
         }
-        return m_way_cache.get();
+        return &m_way_cache.get();
     }
 
-    assert(m_calling_context == calling_context::process_relation);
-
-    if (!table.matches_type(osmium::item_type::relation)) {
-        throw fmt_error("Trying to add relation to table '{}'.", table.name());
+    if (m_calling_context == calling_context::process_relation) {
+        if (!table.matches_type(osmium::item_type::relation)) {
+            throw fmt_error("Trying to add relation to table '{}'.",
+                            table.name());
+        }
+        return &m_relation_cache.get();
     }
-    return m_relation_cache.get();
+
+    return nullptr;
 }
 
 int output_flex_t::table_insert()
@@ -766,34 +769,32 @@ int output_flex_t::table_insert()
         return 0;
     }
 
-    if (m_calling_context != calling_context::process_node &&
-        m_calling_context != calling_context::process_way &&
-        m_calling_context != calling_context::process_relation) {
-        throw std::runtime_error{
-            "The function insert() can only be called from the "
-            "process_node/way/relation() functions."};
-    }
-
     auto const num_params = lua_gettop(lua_state());
     if (num_params != 2) {
         throw std::runtime_error{
             "Need two parameters: The osm2pgsql.Table and the row data."};
     }
 
     // The first parameter is the table object.
-    auto &table_connection = m_table_connections.at(
-        idx_from_param(lua_state(), OSM2PGSQL_TABLE_CLASS));
+    std::size_t const idx = idx_from_param(lua_state(), OSM2PGSQL_TABLE_CLASS);
+    if (idx >= m_table_connections.size()) {
+        throw std::runtime_error{"Tables not initialized yet. Insert can only "
+                                 "be called from processing functions."};
+    }
+    auto &table_connection = m_table_connections.at(idx);
 
     // The second parameter must be a Lua table with the contents for the
     // fields.
     luaL_checktype(lua_state(), 2, LUA_TTABLE);
     lua_remove(lua_state(), 1);
 
     auto const &table = table_connection.table();
-    auto const &object = check_and_get_context_object(table);
-    osmid_t const id = table.map_id(object.type(), object.id());
+    auto const *object = check_and_get_context_object(table);
+
+    auto const objtype = object ? object->type() : osmium::item_type::undefined;
+    osmid_t const id = object ? table.map_id(objtype, object->id()) : 0;
 
-    if (table.with_id_cache()) {
+    if (id && table.with_id_cache()) {
         get_id_cache(table).push_back(id);
     }
 
@@ -806,8 +807,16 @@ int output_flex_t::table_insert()
                 continue;
             }
             if (column.type() == table_column_type::id_type) {
-                copy_mgr->add_column(type_to_char(object.type()));
+                if (objtype == osmium::item_type::undefined) {
+                    throw fmt_error("No context object for column '{}'",
+                                    column.name());
+                }
+                copy_mgr->add_column(type_to_char(objtype));
             } else if (column.type() == table_column_type::id_num) {
+                if (id == 0) {
+                    throw fmt_error("No context object for column '{}'",
+                                    column.name());
+                }
                 copy_mgr->add_column(id);
             } else {
                 flex_write_column(lua_state(), &m_geometry_cache, copy_mgr,
@@ -820,7 +829,9 @@ int output_flex_t::table_insert()
         lua_pushboolean(lua_state(), false);
         lua_pushliteral(lua_state(), "null value in not null column.");
         luaX_pushstring(lua_state(), e.column().name());
-        push_osm_object_to_lua_stack(lua_state(), object);
+        if (object) {
+            push_osm_object_to_lua_stack(lua_state(), *object);
+        }
         table_connection.increment_not_null_error_counter();
         return 4;
     }

src/output-flex.hpp

@@ -202,7 +202,7 @@ class output_flex_t : public output_t
     void check_context_and_state(char const *name, char const *context,
                                  bool condition);
 
-    osmium::OSMObject const &
+    osmium::OSMObject const *
     check_and_get_context_object(flex_table_t const &table);
 
     void node_delete(osmid_t id);