Merge pull request #2284 from lonvia/cleanup-word-frequency-computation

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

diff --git a/nominatim/db/sql_preprocessor.py b/nominatim/db/sql_preprocessor.py
index 852447525ab26fcb0dc80edf69bfc5096b9c2368..c7009b34fc0a7b1e9d8a3a0717d8ac875a7c9b41 100644 (file)
--- a/nominatim/db/sql_preprocessor.py
+++ b/nominatim/db/sql_preprocessor.py
@@ -49,12 +49,21 @@ def _setup_postgres_sql(conn):
     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
     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

-    # unsing this construct.
+    # using this construct.

     out['if_index_not_exists'] = ' IF NOT EXISTS ' if pg_version >= (9, 5, 0) else ''
 
     return out
 
 
     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.
+    """
+    pg_version = conn.server_version_tuple()
+    return {
+        'has_index_non_key_column' : pg_version >= (11, 0, 0)
+    }
+

 class SQLPreprocessor: # pylint: disable=too-few-public-methods
     """ A environment for preprocessing SQL files from the
         lib-sql directory.
 class SQLPreprocessor: # pylint: disable=too-few-public-methods
     """ A environment for preprocessing SQL files from the
         lib-sql directory.


@@ -66,9 +75,9 @@ class SQLPreprocessor: # pylint: disable=too-few-public-methods
         and follows its syntax.
     """
 
         and follows its syntax.
     """
 

-    def __init__(self, conn, config, sqllib_dir):
+    def __init__(self, conn, config):

         self.env = jinja2.Environment(autoescape=False,
         self.env = jinja2.Environment(autoescape=False,

-                                      loader=jinja2.FileSystemLoader(str(sqllib_dir)))
+                                      loader=jinja2.FileSystemLoader(str(config.lib_dir.sql)))

 
         db_info = {}
         db_info['partitions'] = _get_partitions(conn)
 
         db_info = {}
         db_info['partitions'] = _get_partitions(conn)


@@ -79,6 +88,7 @@ class SQLPreprocessor: # pylint: disable=too-few-public-methods
         self.env.globals['config'] = config
         self.env.globals['db'] = db_info
         self.env.globals['sql'] = _setup_postgres_sql(conn)
         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)

         self.env.globals['modulepath'] = config.DATABASE_MODULE_PATH or \
                                          str((config.project_dir / 'module').resolve())
 
         self.env.globals['modulepath'] = config.DATABASE_MODULE_PATH or \
                                          str((config.project_dir / 'module').resolve())