Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / db / sql_preprocessor.py

diff --git a/nominatim/db/sql_preprocessor.py b/nominatim/db/sql_preprocessor.py
index 31b4a8c0f9a0042877cb652f6578fe2e896a899a..2e11f57195323e2e53aec9dc77d541f81b6522e6 100644 (file)
--- a/nominatim/db/sql_preprocessor.py
+++ b/nominatim/db/sql_preprocessor.py
@@ -57,9 +57,11 @@ def _setup_postgresql_features(conn: Connection) -> Dict[str, Any]:
     """
     pg_version = conn.server_version_tuple()
     postgis_version = conn.postgis_version_tuple()
     """
     pg_version = conn.server_version_tuple()
     postgis_version = conn.postgis_version_tuple()

+    pg11plus = pg_version >= (11, 0, 0)
+    ps3 = postgis_version >= (3, 0)

     return {
     return {

-        'has_index_non_key_column': pg_version >= (11, 0, 0),
-        'spgist_geom' : 'SPGIST' if postgis_version >= (3, 0) else 'GIST'
+        'has_index_non_key_column': pg11plus,
+        'spgist_geom' : 'SPGIST' if pg11plus and ps3 else 'GIST'

     }
 
 class SQLPreprocessor:
     }
 
 class SQLPreprocessor: