Merge pull request #3356 from lonvia/use-date-from-osm2pgsql-prop

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

diff --git a/nominatim/db/sql_preprocessor.py b/nominatim/db/sql_preprocessor.py
index 3762d82eff1a8a0b0a8e17223eb3f9f9c154e329..af5bc3357959abf52b9518e83144403e2150564b 100644 (file)
--- a/nominatim/db/sql_preprocessor.py
+++ b/nominatim/db/sql_preprocessor.py
@@ -7,7 +7,7 @@
 """
 Preprocessing of SQL files.
 """
 """
 Preprocessing of SQL files.
 """

-from typing import Set, Dict, Any
+from typing import Set, Dict, Any, cast

 import jinja2
 
 from nominatim.db.connection import Connection
 import jinja2
 
 from nominatim.db.connection import Connection


@@ -28,13 +28,24 @@ def _get_partitions(conn: Connection) -> Set[int]:
 
 def _get_tables(conn: Connection) -> Set[str]:
     """ Return the set of tables currently in use.
 
 def _get_tables(conn: Connection) -> Set[str]:
     """ Return the set of tables currently in use.

-        Only includes non-partitioned

     """
     with conn.cursor() as cur:
         cur.execute("SELECT tablename FROM pg_tables WHERE schemaname = 'public'")
 
         return set((row[0] for row in list(cur)))
 
     """
     with conn.cursor() as cur:
         cur.execute("SELECT tablename FROM pg_tables WHERE schemaname = 'public'")
 
         return set((row[0] for row in list(cur)))
 

+def _get_middle_db_format(conn: Connection, tables: Set[str]) -> str:
+    """ Returns the version of the slim middle tables.
+    """
+    if 'osm2pgsql_properties' not in tables:
+        return '1'
+
+    with conn.cursor() as cur:
+        cur.execute("SELECT value FROM osm2pgsql_properties WHERE property = 'db_format'")
+        row = cur.fetchone()
+
+        return cast(str, row[0]) if row is not None else '1'
+

 
 def _setup_tablespace_sql(config: Configuration) -> Dict[str, str]:
     """ Returns a dict with tablespace expressions for the different tablespace
 
 def _setup_tablespace_sql(config: Configuration) -> Dict[str, str]:
     """ Returns a dict with tablespace expressions for the different tablespace


@@ -84,6 +95,7 @@ class SQLPreprocessor:
         db_info['tables'] = _get_tables(conn)
         db_info['reverse_only'] = 'search_name' not in db_info['tables']
         db_info['tablespace'] = _setup_tablespace_sql(config)
         db_info['tables'] = _get_tables(conn)
         db_info['reverse_only'] = 'search_name' not in db_info['tables']
         db_info['tablespace'] = _setup_tablespace_sql(config)

+        db_info['middle_db_format'] = _get_middle_db_format(conn, db_info['tables'])

 
         self.env.globals['config'] = config
         self.env.globals['db'] = db_info
 
         self.env.globals['config'] = config
         self.env.globals['db'] = db_info


@@ -115,7 +127,7 @@ class SQLPreprocessor:
 
     def run_parallel_sql_file(self, dsn: str, name: str, num_threads: int = 1,
                               **kwargs: Any) -> None:
 
     def run_parallel_sql_file(self, dsn: str, name: str, num_threads: int = 1,
                               **kwargs: Any) -> None:

-        """ Execure the given SQL files using parallel asynchronous connections.
+        """ Execute the given SQL files using parallel asynchronous connections.

             The keyword arguments may supply additional parameters for
             preprocessing.
 
             The keyword arguments may supply additional parameters for
             preprocessing.