increase minimum required versions for dependencies

This is in line with what can be tested in the CI.

Author: lonvia

CMakeLists.txt

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

README.md

@@ -66,12 +66,12 @@ with other versions of those libraries (set the `EXTERNAL_*libname*` option to
 * [protozero](https://github.com/mapbox/protozero) (>= 1.6.3)
 
 It also requires access to a database server running
-[PostgreSQL](https://www.postgresql.org/) (version 9.6+ works, 13+ strongly
-recommended) and [PostGIS](https://www.postgis.net/) (version 2.5+).
+[PostgreSQL](https://www.postgresql.org/) (version 11+ works, 13+ strongly
+recommended) and [PostGIS](https://www.postgis.net/) (version 3.0+).
 
 Make sure you have installed the development packages for the libraries
 mentioned in the requirements section and a C++ compiler which supports C++17.
-We officially support gcc >= 8.0 and clang >= 8.
+We officially support gcc >= 10.0 and clang >= 13.
 
 To rebuild the included man page you'll need the [pandoc](https://pandoc.org/)
 tool.

src/flex-lua-index.cpp

@@ -105,23 +105,17 @@ void flex_lua_setup_index(lua_State *lua_state, flex_table_t *table)
     // get include columns
     std::vector<std::string> include_columns;
     lua_getfield(lua_state, -1, "include");
-    if (get_database_version() >= 110000) {
-        if (lua_isstring(lua_state, -1)) {
-            check_and_add_column(*table, &include_columns,
-                                 lua_tostring(lua_state, -1));
-        } else if (lua_istable(lua_state, -1)) {
-            check_and_add_columns(*table, &include_columns, lua_state);
-        } else if (!lua_isnil(lua_state, -1)) {
-            throw std::runtime_error{
-                "The 'include' field in an index definition must contain a "
-                "string or an array."};
-        }
-        index.set_include_columns(include_columns);
+    if (lua_isstring(lua_state, -1)) {
+        check_and_add_column(*table, &include_columns,
+                             lua_tostring(lua_state, -1));
+    } else if (lua_istable(lua_state, -1)) {
+        check_and_add_columns(*table, &include_columns, lua_state);
     } else if (!lua_isnil(lua_state, -1)) {
-        throw fmt_error("Database version ({}) doesn't support"
-                        " include columns in indexes.",
-                        get_database_version());
+        throw std::runtime_error{
+            "The 'include' field in an index definition must contain a "
+            "string or an array."};
     }
+    index.set_include_columns(include_columns);
     lua_pop(lua_state, 1);
 
     // get tablespace

src/osm2pgsql.cpp

@@ -89,8 +89,8 @@ void check_db(options_t const &options)
     init_database_capabilities(db_connection);
 
     auto const pv = get_postgis_version();
-    if (pv.major < 2 || (pv.major == 2 && pv.minor < 5)) {
-        throw std::runtime_error{"Need at least PostGIS version 2.5"};
+    if (pv.major < 3) {
+        throw std::runtime_error{"Need at least PostGIS version 3.0"};
     }
 
     check_schema(options.dbschema);