Merge remote-tracking branch 'upstream/master'

[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..79f82daccd150a7b9371bcadd02ea6fc121ed8a2 100644 (file)
--- a/test/python/test_db_sql_preprocessor.py
+++ b/test/python/test_db_sql_preprocessor.py
@@ -1,12 +1,8 @@
 """
 Tests for SQL preprocessing.
 """
 """
 Tests for SQL preprocessing.
 """

-from pathlib import Path
-

 import pytest
 
 import pytest
 

-from nominatim.db.sql_preprocessor import SQLPreprocessor
-

 @pytest.fixture
 def sql_factory(tmp_path):
     def _mk_sql(sql_body):
 @pytest.fixture
 def sql_factory(tmp_path):
     def _mk_sql(sql_body):


@@ -21,19 +17,11 @@ 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}}'", '.')

     ])
 def test_load_file_simple(sql_preprocessor, sql_factory, temp_db_conn, temp_db_cursor, expr, ret):
     sqlfile = sql_factory("RETURN {};".format(expr))
     ])
 def test_load_file_simple(sql_preprocessor, sql_factory, temp_db_conn, temp_db_cursor, expr, ret):
     sqlfile = sql_factory("RETURN {};".format(expr))