From 6a5695d059d350761707058d514877b9003620da Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Tue, 13 Jun 2023 15:15:43 +0200 Subject: [PATCH] disable SPGist for PostgreSQL < 11 Before that version, an operator needed to be given. --- nominatim/db/sql_preprocessor.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nominatim/db/sql_preprocessor.py b/nominatim/db/sql_preprocessor.py index 31b4a8c0..2e11f571 100644 --- 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() + pg11plus = pg_version >= (11, 0, 0) + ps3 = postgis_version >= (3, 0) 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: