Add return values from insert

Author: joto

flex-config/new-insert-syntax.lua

@@ -6,6 +6,23 @@
 --
 -- Note that the insert() function is used instead of the old add_row()!
 
+-- The following magic can be used to wrap the internal "insert" function
+local orig_insert = osm2pgsql.Table.insert
+local function my_insert(table, data)
+    local json = require 'json'
+    inserted, message, column, object = orig_insert(table, data)
+    if not inserted then
+        for key, value in pairs(data) do
+            if type(value) == 'userdata' then
+                data[key] = tostring(value)
+            end
+        end
+        print("insert() failed: " .. message .. " column='" .. column .. "' object='" .. json.encode(object) .. "' data='" .. json.encode(data) .. "'")
+    end
+end
+osm2pgsql.Table.insert = my_insert
+
+
 local tables = {}
 
 -- This table will get all nodes and areas with an "addr:street" tag, for
@@ -35,7 +52,7 @@ tables.major_roads = osm2pgsql.define_way_table('major_roads', {
 
 tables.polygons = osm2pgsql.define_area_table('polygons', {
     { column = 'tags', type = 'jsonb' },
-    { column = 'geom', type = 'geometry' },
+    { column = 'geom', type = 'geometry', not_null = true },
     { column = 'area4326', type = 'real' },
     { column = 'area3857', type = 'real' }
 })

src/db-copy-mgr.hpp

@@ -43,6 +43,13 @@ class db_copy_mgr_t
 
             m_current = std::make_unique<db_cmd_copy_delete_t<DELETER>>(table);
         }
+        m_committed = m_current->buffer.size();
+    }
+
+    void rollback_line()
+    {
+        assert(m_current);
+        m_current->buffer.resize(m_committed);
     }
 
     /**
@@ -356,6 +363,7 @@ class db_copy_mgr_t
 
     std::shared_ptr<db_copy_thread_t> m_processor;
     std::unique_ptr<db_cmd_copy_delete_t<DELETER>> m_current;
+    std::size_t m_committed = 0;
 };
 
 #endif // OSM2PGSQL_DB_COPY_MGR_HPP

src/output-flex.cpp

@@ -254,13 +254,28 @@ static int sgn(double val) noexcept
     return 0;
 }
 
+class not_null_exception : public std::runtime_error
+{
+public:
+    not_null_exception(std::string const &message,
+                       flex_table_column_t const *column)
+    : std::runtime_error(message), m_column(column)
+    {}
+
+    flex_table_column_t const &column() const noexcept { return *m_column; }
+
+private:
+    flex_table_column_t const *m_column;
+}; // class not_null_exception
+
 static void write_null(db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
                        flex_table_column_t const &column)
 {
     if (column.not_null()) {
-        throw std::runtime_error{
+        throw not_null_exception{
             "Can not add NULL to column '{}' declared NOT NULL."_format(
-                column.name())};
+                column.name()),
+            &column};
     }
     copy_mgr->add_null_column();
 }
@@ -1572,22 +1587,33 @@ int output_flex_t::table_insert()
     table_connection.new_line();
     auto *copy_mgr = table_connection.copy_mgr();
 
-    for (auto const &column : table_connection.table()) {
-        if (column.create_only()) {
-            continue;
-        }
-        if (column.type() == table_column_type::id_type) {
-            copy_mgr->add_column(type_to_char(object.type()));
-        } else if (column.type() == table_column_type::id_num) {
-            copy_mgr->add_column(id);
-        } else {
-            write_column(copy_mgr, column);
+    try {
+        for (auto const &column : table_connection.table()) {
+            if (column.create_only()) {
+                continue;
+            }
+            if (column.type() == table_column_type::id_type) {
+                copy_mgr->add_column(type_to_char(object.type()));
+            } else if (column.type() == table_column_type::id_num) {
+                copy_mgr->add_column(id);
+            } else {
+                write_column(copy_mgr, column);
+            }
         }
+    } catch (not_null_exception const &e) {
+        copy_mgr->rollback_line();
+        lua_pushboolean(lua_state(), false);
+        lua_pushstring(lua_state(), "null value in not null column.");
+        lua_pushstring(lua_state(), e.column().name().c_str());
+        push_osm_object_to_lua_stack(lua_state(), object,
+                                     get_options()->extra_attributes);
+        return 4;
     }
 
     copy_mgr->finish_line();
 
-    return 0;
+    lua_pushboolean(lua_state(), true);
+    return 1;
 }
 
 int output_flex_t::table_columns()
@@ -2184,10 +2210,17 @@ void output_flex_t::init_lua(std::string const &filename)
 
     lua_setglobal(lua_state(), "osm2pgsql");
 
-    // Define "osmpgsql.table" metatable
+    // Define "osm2pgsql.table" metatable
+    lua_getglobal(lua_state(), "osm2pgsql");
     if (luaL_newmetatable(lua_state(), osm2pgsql_table_name) != 1) {
         throw std::runtime_error{"Internal error: Lua newmetatable failed."};
     }
+    lua_pushvalue(lua_state(), -1); // Copy of new metatable
+
+    // Add metatable as osm2pgsql.Table so we can access it from Lua
+    lua_setfield(lua_state(), -3, "Table");
+
+    // Now add functions to metatable
     lua_pushvalue(lua_state(), -1);
     lua_setfield(lua_state(), -2, "__index");
     luaX_add_table_func(lua_state(), "__tostring",