safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

use load_sql fixture instead of explicit SQLPreprocessor

Browse Source
This commit is contained in:
Sarah Hoffmann
2026-02-12 22:18:37 +01:00
parent 0d423ad7a7
commit 2750d66470
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/python/tokenizer/test_icu.py
View File

@@ -15,7 +15,6 @@ import pytest
from nominatim_db.tokenizer import icu_tokenizer from nominatim_db.tokenizer import icu_tokenizer
import nominatim_db.tokenizer.icu_rule_loader import nominatim_db.tokenizer.icu_rule_loader
from nominatim_db.db import properties from nominatim_db.db import properties
from nominatim_db.db.sql_preprocessor import SQLPreprocessor
from nominatim_db.data.place_info import PlaceInfo from nominatim_db.data.place_info import PlaceInfo
from mock_icu_word_table import MockIcuWordTable from mock_icu_word_table import MockIcuWordTable
@@ -90,13 +89,9 @@ def analyzer(tokenizer_factory, test_config, monkeypatch,
@pytest.fixture @pytest.fixture
def sql_functions(temp_db_conn, def_config, src_dir): def sql_functions(load_sql):
orig_sql = def_config.lib_dir.sql load_sql('functions/utils.sql')
def_config.lib_dir.sql = src_dir / 'lib-sql' load_sql('tokenizer/icu_tokenizer.sql')
sqlproc = SQLPreprocessor(temp_db_conn, def_config)
sqlproc.run_sql_file(temp_db_conn, 'functions/utils.sql')
sqlproc.run_sql_file(temp_db_conn, 'tokenizer/icu_tokenizer.sql')
def_config.lib_dir.sql = orig_sql
@pytest.fixture @pytest.fixture

9
test/python/tools/test_admin.py
View File

@@ -13,7 +13,6 @@ import datetime as dt
from nominatim_db.errors import UsageError from nominatim_db.errors import UsageError
from nominatim_db.tools import admin from nominatim_db.tools import admin
from nominatim_db.tokenizer import factory from nominatim_db.tokenizer import factory
from nominatim_db.db.sql_preprocessor import SQLPreprocessor
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)
@@ -78,7 +77,7 @@ class TestAdminCleanDeleted:
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)
def setup_polygon_delete(self, project_env, table_factory, place_table, placex_row, def setup_polygon_delete(self, project_env, table_factory, place_table, placex_row,
osmline_table, temp_db_cursor, temp_db_conn, def_config, src_dir): osmline_table, temp_db_cursor, load_sql):
""" Set up place_force_delete function and related tables """ Set up place_force_delete function and related tables
""" """
self.project_env = project_env self.project_env = project_env
@@ -117,11 +116,7 @@ class TestAdminCleanDeleted:
$$ LANGUAGE plpgsql;""") $$ LANGUAGE plpgsql;""")
temp_db_cursor.execute("""CREATE TRIGGER place_before_delete BEFORE DELETE ON place temp_db_cursor.execute("""CREATE TRIGGER place_before_delete BEFORE DELETE ON place
FOR EACH ROW EXECUTE PROCEDURE place_delete();""") FOR EACH ROW EXECUTE PROCEDURE place_delete();""")
orig_sql = def_config.lib_dir.sql load_sql('functions/utils.sql')
def_config.lib_dir.sql = src_dir / 'lib-sql'
sqlproc = SQLPreprocessor(temp_db_conn, def_config)
sqlproc.run_sql_file(temp_db_conn, 'functions/utils.sql')
def_config.lib_dir.sql = orig_sql
def test_admin_clean_deleted_no_records(self): def test_admin_clean_deleted_no_records(self):
admin.clean_deleted_relations(self.project_env, age='1 year') admin.clean_deleted_relations(self.project_env, age='1 year')