hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove special code for pre9.5 postgresql

Browse Source 
9.5 is now the minimum requirement.
This commit is contained in:
Sarah Hoffmann
2021-07-19 10:24:57 +02:00
parent e7d6f89aca
commit 2c8242c8df
4 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
nominatim/db/sql_preprocessor.py
View File

@@ -41,20 +41,6 @@ def _setup_tablespace_sql(config):
return out
def _setup_postgres_sql(conn):
""" Set up a dictionary with various Postgresql/Postgis SQL terms which
are dependent on the database version in use.
"""
out = {}
pg_version = conn.server_version_tuple()
# CREATE INDEX IF NOT EXISTS was introduced in PG9.5.
# Note that you need to ignore failures on older versions when
# using this construct.
out['if_index_not_exists'] = ' IF NOT EXISTS ' if pg_version >= (9, 5, 0) else ''
return out
def _setup_postgresql_features(conn):
""" Set up a dictionary with various optional Postgresql/Postgis features that
depend on the database version.
@@ -87,7 +73,6 @@ class SQLPreprocessor:
self.env.globals['config'] = config
self.env.globals['db'] = db_info
self.env.globals['sql'] = _setup_postgres_sql(conn)
self.env.globals['postgres'] = _setup_postgresql_features(conn)