Check earlier that the database has the hstore extension

Author: joto

src/flex-table-column.cpp

@@ -9,6 +9,7 @@
 
 #include "flex-table-column.hpp"
 #include "format.hpp"
+#include "pgsql-capabilities.hpp"
 #include "util.hpp"
 
 #include <algorithm>
@@ -82,7 +83,14 @@ flex_table_column_t::flex_table_column_t(std::string name,
 : m_name(std::move(name)), m_type_name(lowercase(type)),
   m_sql_type(std::move(sql_type)),
   m_type(get_column_type_from_string(m_type_name))
-{}
+{
+    if (m_type == table_column_type::hstore) {
+        if (!has_extension("hstore")) {
+            throw std::runtime_error{"Extension 'hstore' not available. Use "
+                                     "'CREATE EXTENSION hstore;' to load it."};
+        }
+    }
+}
 
 void flex_table_column_t::set_projection(char const *projection)
 {

src/flex-table.cpp

@@ -74,14 +74,6 @@ bool flex_table_t::has_id_column() const noexcept
            (m_columns[0].type() == table_column_type::id_num);
 }
 
-bool flex_table_t::has_hstore_column() const noexcept
-{
-    auto const it = std::find_if(begin(), end(), [&](auto const &column) {
-        return column.type() == table_column_type::hstore;
-    });
-    return it != end();
-}
-
 bool flex_table_t::matches_type(osmium::item_type type) const noexcept
 {
     // This table takes any type -> okay
@@ -277,13 +269,6 @@ void table_connection_t::start(bool append)
         }
     }
 
-    if (table().has_hstore_column()) {
-        if (!has_extension("hstore")) {
-            throw std::runtime_error{"Extension 'hstore' not available. Use "
-                                     "'CREATE EXTENSION hstore;' to load it."};
-        }
-    }
-
     m_db_connection->exec("SET client_min_messages = WARNING");
 
     if (!append) {

src/flex-table.hpp

@@ -104,8 +104,6 @@ class flex_table_t
         return m_geom_column != std::numeric_limits<std::size_t>::max();
     }
 
-    bool has_hstore_column() const noexcept;
-
     /// Get the (first, if there are multiple) geometry column.
     flex_table_column_t const &geom_column() const noexcept
     {