raise PostgreSQL requirement to 9.6

The new code uses the open-ended array notation which is only
available sind psql 9.6.

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index f326c3caed7897e2f625d31631e116d909c7ddb3..6d474a2e2b3fe90d4021d6af54d25085f020938a 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -40,7 +40,7 @@ jobs:
                 ubuntu: [18, 20]
                 include:
                     - ubuntu: 18
                 ubuntu: [18, 20]
                 include:
                     - ubuntu: 18

-                      postgresql: 9.5
+                      postgresql: 9.6

                       postgis: 2.5
                       pytest: pytest
                       php: 7.2
                       postgis: 2.5
                       pytest: pytest
                       php: 7.2

diff --git a/docs/admin/Faq.md b/docs/admin/Faq.md
index d933a84d468a0fc55440944e56e51b727eae57fd..5737cef5540c5a3a4887a7f0fdb67c8ddbb1bb76 100644 (file)
--- a/docs/admin/Faq.md
+++ b/docs/admin/Faq.md
@@ -79,7 +79,7 @@ When running the import you may get a version mismatch:
 
 pg_config seems to use bad includes sometimes when multiple versions
 of PostgreSQL are available in the system. Make sure you remove the
 
 pg_config seems to use bad includes sometimes when multiple versions
 of PostgreSQL are available in the system. Make sure you remove the

-server development libraries (`postgresql-server-dev-9.5` on Ubuntu)
+server development libraries (`postgresql-server-dev-13` on Ubuntu)

 and recompile (`cmake .. && make`).
 
 
 and recompile (`cmake .. && make`).
 
 

diff --git a/docs/admin/Installation.md b/docs/admin/Installation.md
index 6b63b0d3cfe62266240d4067ff75cb7315e742e6..19ad2dbb9b0be7853a67346edf17d2fd1d5606db 100644 (file)
--- a/docs/admin/Installation.md
+++ b/docs/admin/Installation.md
@@ -41,7 +41,7 @@ For compiling:
 
 For running Nominatim:
 
 
 For running Nominatim:
 

-  * [PostgreSQL](https://www.postgresql.org) (9.5+ will work, 11+ strongly recommended)
+  * [PostgreSQL](https://www.postgresql.org) (9.6+ will work, 11+ strongly recommended)

   * [PostGIS](https://postgis.net) (2.2+ will work, 3.0+ strongly recommended)
   * [Python 3](https://www.python.org/) (3.6+)
   * [Psycopg2](https://www.psycopg.org) (2.7+)
   * [PostGIS](https://postgis.net) (2.2+ will work, 3.0+ strongly recommended)
   * [Python 3](https://www.python.org/) (3.6+)
   * [Psycopg2](https://www.psycopg.org) (2.7+)

diff --git a/module/CMakeLists.txt b/module/CMakeLists.txt
index 6aef6a5acfb12ad4d9bfc3f664f55701c21ef266..9684a8172ef0fdf7fc7de08564b99e3cb634a695 100644 (file)
--- a/module/CMakeLists.txt
+++ b/module/CMakeLists.txt
@@ -1,6 +1,6 @@
 # just use the pgxs makefile
 
 # just use the pgxs makefile
 

-foreach(suffix ${PostgreSQL_ADDITIONAL_VERSIONS} "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3")
+foreach(suffix ${PostgreSQL_ADDITIONAL_VERSIONS} "14" "13" "12" "11" "10" "9.6")

     list(APPEND PG_CONFIG_HINTS
          "/usr/pgsql-${suffix}/bin")
 endforeach()
     list(APPEND PG_CONFIG_HINTS
          "/usr/pgsql-${suffix}/bin")
 endforeach()