Merge pull request #2486 from lonvia/fix-special-phrases

[nominatim.git] / test / python / test_db_sql_preprocessor.py

diff --git a/test/python/test_db_sql_preprocessor.py b/test/python/test_db_sql_preprocessor.py
index 3c10000f9169c883f56547665fef1e171f27ba90..2ca0c66112e8b8f094a2045e681cb3fa6bc10eae 100644 (file)
--- a/test/python/test_db_sql_preprocessor.py
+++ b/test/python/test_db_sql_preprocessor.py
@@ -1,8 +1,6 @@
 """
 Tests for SQL preprocessing.
 """
 """
 Tests for SQL preprocessing.
 """

-from pathlib import Path
-

 import pytest
 
 from nominatim.db.sql_preprocessor import SQLPreprocessor
 import pytest
 
 from nominatim.db.sql_preprocessor import SQLPreprocessor


@@ -21,24 +19,25 @@ def sql_factory(tmp_path):
 
     return _mk_sql
 
 
     return _mk_sql
 

-
-@pytest.fixture
-def sql_preprocessor(temp_db_conn, tmp_path, def_config, monkeypatch, table_factory):
-    monkeypatch.setenv('NOMINATIM_DATABASE_MODULE_PATH', '.')
-    table_factory('country_name', 'partition INT', (0, 1, 2))
-    return SQLPreprocessor(temp_db_conn, def_config, tmp_path)
-

 @pytest.mark.parametrize("expr,ret", [
     ("'a'", 'a'),
     ("'{{db.partitions|join}}'", '012'),
     ("{% if 'country_name' in db.tables %}'yes'{% else %}'no'{% endif %}", "yes"),
     ("{% if 'xxx' in db.tables %}'yes'{% else %}'no'{% endif %}", "no"),
 @pytest.mark.parametrize("expr,ret", [
     ("'a'", 'a'),
     ("'{{db.partitions|join}}'", '012'),
     ("{% if 'country_name' in db.tables %}'yes'{% else %}'no'{% endif %}", "yes"),
     ("{% if 'xxx' in db.tables %}'yes'{% else %}'no'{% endif %}", "no"),

-    ("'{{config.DATABASE_MODULE_PATH}}'", '.')
+    ("'{{db.tablespace.address_data}}'", ""),
+    ("'{{db.tablespace.search_data}}'", 'TABLESPACE "dsearch"'),
+    ("'{{db.tablespace.address_index}}'", 'TABLESPACE "iaddress"'),
+    ("'{{db.tablespace.aux_data}}'", 'TABLESPACE "daux"')

     ])
     ])

-def test_load_file_simple(sql_preprocessor, sql_factory, temp_db_conn, temp_db_cursor, expr, ret):
+def test_load_file_simple(sql_preprocessor_cfg, sql_factory,
+                          temp_db_conn, temp_db_cursor, monkeypatch,
+                          expr, ret):
+    monkeypatch.setenv('NOMINATIM_TABLESPACE_SEARCH_DATA', 'dsearch')
+    monkeypatch.setenv('NOMINATIM_TABLESPACE_ADDRESS_INDEX', 'iaddress')
+    monkeypatch.setenv('NOMINATIM_TABLESPACE_AUX_DATA', 'daux')

     sqlfile = sql_factory("RETURN {};".format(expr))
 
     sqlfile = sql_factory("RETURN {};".format(expr))
 

-    sql_preprocessor.run_sql_file(temp_db_conn, sqlfile)
+    SQLPreprocessor(temp_db_conn, sql_preprocessor_cfg).run_sql_file(temp_db_conn, sqlfile)

 
     assert temp_db_cursor.scalar('SELECT test()') == ret
 
 
     assert temp_db_cursor.scalar('SELECT test()') == ret