Merge pull request #1843 from joto/refactor-db-capabilities

Consolidate database capability checks

Author: lonvia

.github/workflows/ci.yml

@@ -39,16 +39,15 @@ jobs:
         env:
           PGHOST: /tmp
 
-
-  ubuntu18-pg95-gcc7-jit:
+  ubuntu18-pg96-gcc7-jit:
     runs-on: ubuntu-18.04
 
     env:
       CC: gcc-7
       CXX: g++-7
       LUA_VERSION: 5.3
       LUAJIT_OPTION: ON
-      POSTGRESQL_VERSION: 9.5
+      POSTGRESQL_VERSION: 9.6
       POSTGIS_VERSION: 2.4
       BUILD_TYPE: Release
 

CMakeLists.txt

@@ -66,10 +66,10 @@ if (NOT WIN32 AND NOT APPLE)
     set(PostgreSQL_TYPE_INCLUDE_DIR /usr/include)
 endif()
 
-set(MINIMUM_POSTGRESQL_SERVER_VERSION "9.5")
-set(MINIMUM_POSTGRESQL_SERVER_VERSION_NUM "90500")
+set(MINIMUM_POSTGRESQL_SERVER_VERSION "9.6")
+set(MINIMUM_POSTGRESQL_SERVER_VERSION_NUM "90600")
 
-set(PostgreSQL_ADDITIONAL_VERSIONS "14" "13" "12" "11" "10" "9.6" "9.5")
+set(PostgreSQL_ADDITIONAL_VERSIONS "15" "14" "13" "12" "11" "10" "9.6")
 
 #############################################################
 # Version

src/CMakeLists.txt

@@ -2,7 +2,6 @@
 add_library(osm2pgsql_lib STATIC)
 
 target_sources(osm2pgsql_lib PRIVATE
-  db-check.cpp
   db-copy.cpp
   dependency-manager.cpp
   expire-tiles.cpp

src/db-check.cpp

@@ -255,7 +255,7 @@ void table_connection_t::start(bool append)
 {
     assert(m_db_connection);
 
-    if (!has_schema(*m_db_connection, table().schema())) {
+    if (!has_schema(table().schema())) {
         throw std::runtime_error{
             "Schema '{0}' not available. "
             "Use 'CREATE SCHEMA \"{0}\";' to create it."_format(
@@ -264,7 +264,7 @@ void table_connection_t::start(bool append)
 
     for (auto const &ts :
          {table().data_tablespace(), table().index_tablespace()}) {
-        if (!has_tablespace(*m_db_connection, ts)) {
+        if (!has_tablespace(ts)) {
             throw std::runtime_error{
                 "Tablespace '{0}' not available. "
                 "Use 'CREATE TABLESPACE \"{0}\" ...;' to create it."_format(
@@ -273,7 +273,7 @@ void table_connection_t::start(bool append)
     }
 
     if (table().has_hstore_column()) {
-        if (!has_extension(*m_db_connection, "hstore")) {
+        if (!has_extension("hstore")) {
             throw std::runtime_error{"Extension 'hstore' not available. Use "
                                      "'CREATE EXTENSION hstore;' to load it."};
         }
@@ -333,7 +333,7 @@ void table_connection_t::stop(bool updateable, bool append)
         std::string sql = "INSERT INTO {} ({}) SELECT {} FROM {}"_format(
             table().full_tmp_name(), columns, columns, table().full_name());
 
-        auto const postgis_version = get_postgis_version(*m_db_connection);
+        auto const postgis_version = get_postgis_version();
 
         sql += " ORDER BY ";
         if (postgis_version.major == 2 && postgis_version.minor < 4) {

src/db-check.hpp

@@ -7,14 +7,16 @@
  * For a full list of authors see the git log.
  */
 
-#include "db-check.hpp"
 #include "dependency-manager.hpp"
 #include "input.hpp"
 #include "logging.hpp"
 #include "middle.hpp"
 #include "options.hpp"
 #include "osmdata.hpp"
 #include "output.hpp"
+#include "pgsql.hpp"
+#include "pgsql-capabilities.hpp"
+#include "pgsql-helper.hpp"
 #include "util.hpp"
 #include "version.hpp"
 
@@ -76,6 +78,26 @@ static void run(options_t const &options)
     osmdata.stop();
 }
 
+void check_db(options_t const &options)
+{
+    pg_conn_t db_connection{options.conninfo};
+
+    init_database_capabilities(db_connection);
+
+    // If we are in append mode and the middle nodes table isn't there,
+    // it probably means we used a flat node store when we created this
+    // database. Check for that and stop if it looks like we are missing
+    // the node location store option.
+    if (options.append && options.flat_node_file.empty()) {
+        if (!has_table(db_connection, options.middle_dbschema,
+                        options.prefix + "_nodes")) {
+            throw std::runtime_error{
+                "You seem to not have a nodes table. Did "
+                "you forget the --flat-nodes option?"};
+        }
+    }
+}
+
 int main(int argc, char *argv[])
 {
     try {