Merge pull request #2053 from joto/deprecate-add-row

Add runtime warnings that area type and add_row() are deprecated

Author: lonvia

src/flex-table-column.cpp

@@ -62,6 +62,12 @@ static table_column_type get_column_type_from_string(std::string const &type)
         throw fmt_error("Unknown column type '{}'.", type);
     }
 
+    if (column_type->type == table_column_type::area) {
+        log_warn("The 'area' column type is deprecated. Please read");
+        log_warn("https://osm2pgsql.org/doc/tutorials/"
+                 "switching-from-add-row-to-insert/");
+    }
+
     return column_type->type;
 }
 

src/output-flex.cpp

@@ -587,6 +587,13 @@ int output_flex_t::table_add_row()
     }
     lua_remove(lua_state(), 1);
 
+    if (m_add_row_has_never_been_called) {
+        m_add_row_has_never_been_called = false;
+        log_warn("The add_row() function is deprecated. Please read");
+        log_warn("https://osm2pgsql.org/doc/tutorials/"
+                 "switching-from-add-row-to-insert/");
+    }
+
     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());

src/output-flex.hpp

@@ -316,6 +316,8 @@ class output_flex_t : public output_t
      * add_row() command.
      */
     bool m_disable_add_row = false;
+
+    bool m_add_row_has_never_been_called = true;
 };
 
 #endif // OSM2PGSQL_OUTPUT_FLEX_HPP