From 2750d6647054a224154f8d7f3dc3fc6d2825655f Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Thu, 12 Feb 2026 22:18:37 +0100 Subject: [PATCH] use load_sql fixture instead of explicit SQLPreprocessor --- test/python/tokenizer/test_icu.py | 11 +++-------- test/python/tools/test_admin.py | 9 ++------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/test/python/tokenizer/test_icu.py b/test/python/tokenizer/test_icu.py index 122c10c3..6a83f193 100644 --- a/test/python/tokenizer/test_icu.py +++ b/test/python/tokenizer/test_icu.py @@ -15,7 +15,6 @@ import pytest from nominatim_db.tokenizer import icu_tokenizer import nominatim_db.tokenizer.icu_rule_loader from nominatim_db.db import properties -from nominatim_db.db.sql_preprocessor import SQLPreprocessor from nominatim_db.data.place_info import PlaceInfo from mock_icu_word_table import MockIcuWordTable @@ -90,13 +89,9 @@ def analyzer(tokenizer_factory, test_config, monkeypatch, @pytest.fixture -def sql_functions(temp_db_conn, def_config, src_dir): - orig_sql = def_config.lib_dir.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') - sqlproc.run_sql_file(temp_db_conn, 'tokenizer/icu_tokenizer.sql') - def_config.lib_dir.sql = orig_sql +def sql_functions(load_sql): + load_sql('functions/utils.sql') + load_sql('tokenizer/icu_tokenizer.sql') @pytest.fixture diff --git a/test/python/tools/test_admin.py b/test/python/tools/test_admin.py index 788c59b1..1097707b 100644 --- a/test/python/tools/test_admin.py +++ b/test/python/tools/test_admin.py @@ -13,7 +13,6 @@ import datetime as dt from nominatim_db.errors import UsageError from nominatim_db.tools import admin from nominatim_db.tokenizer import factory -from nominatim_db.db.sql_preprocessor import SQLPreprocessor @pytest.fixture(autouse=True) @@ -78,7 +77,7 @@ class TestAdminCleanDeleted: @pytest.fixture(autouse=True) 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 """ self.project_env = project_env @@ -117,11 +116,7 @@ class TestAdminCleanDeleted: $$ LANGUAGE plpgsql;""") temp_db_cursor.execute("""CREATE TRIGGER place_before_delete BEFORE DELETE ON place FOR EACH ROW EXECUTE PROCEDURE place_delete();""") - orig_sql = def_config.lib_dir.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 + load_sql('functions/utils.sql') def test_admin_clean_deleted_no_records(self): admin.clean_deleted_relations(self.project_env, age='1 year')