X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c3788d765ed4e7ddf00794085af757714bc102cf..ad95ff1d067aed8b83579d10dd0c8802803e4a41:/test/python/tools/test_admin.py?ds=sidebyside diff --git a/test/python/tools/test_admin.py b/test/python/tools/test_admin.py index e53d35c4..ae5944af 100644 --- a/test/python/tools/test_admin.py +++ b/test/python/tools/test_admin.py @@ -11,37 +11,138 @@ import pytest from nominatim.errors import UsageError from nominatim.tools import admin +from nominatim.tokenizer import factory +from nominatim.db.sql_preprocessor import SQLPreprocessor @pytest.fixture(autouse=True) -def create_placex_table(placex_table): +def create_placex_table(project_env, tokenizer_mock, temp_db_cursor, placex_table): """ All tests in this module require the placex table to be set up. """ + temp_db_cursor.execute("DROP TYPE IF EXISTS prepare_update_info CASCADE") + temp_db_cursor.execute("""CREATE TYPE prepare_update_info AS ( + name HSTORE, + address HSTORE, + rank_address SMALLINT, + country_code TEXT, + class TEXT, + type TEXT, + linked_place_id BIGINT + )""") + temp_db_cursor.execute("""CREATE OR REPLACE FUNCTION placex_indexing_prepare(p placex, + OUT result prepare_update_info) + AS $$ + BEGIN + result.address := p.address; + result.name := p.name; + result.class := p.class; + result.type := p.type; + result.country_code := p.country_code; + result.rank_address := p.rank_address; + END; + $$ LANGUAGE plpgsql STABLE; + """) + factory.create_tokenizer(project_env) -def test_analyse_indexing_no_objects(temp_db_conn): +def test_analyse_indexing_no_objects(project_env): with pytest.raises(UsageError): - admin.analyse_indexing(temp_db_conn) + admin.analyse_indexing(project_env) @pytest.mark.parametrize("oid", ['1234', 'N123a', 'X123']) -def test_analyse_indexing_bad_osmid(temp_db_conn, oid): +def test_analyse_indexing_bad_osmid(project_env, oid): with pytest.raises(UsageError): - admin.analyse_indexing(temp_db_conn, osm_id=oid) + admin.analyse_indexing(project_env, osm_id=oid) -def test_analyse_indexing_unknown_osmid(temp_db_conn): +def test_analyse_indexing_unknown_osmid(project_env): with pytest.raises(UsageError): - admin.analyse_indexing(temp_db_conn, osm_id='W12345674') + admin.analyse_indexing(project_env, osm_id='W12345674') -def test_analyse_indexing_with_place_id(temp_db_conn, temp_db_cursor): +def test_analyse_indexing_with_place_id(project_env, temp_db_cursor): temp_db_cursor.execute("INSERT INTO placex (place_id) VALUES(12345)") - admin.analyse_indexing(temp_db_conn, place_id=12345) + admin.analyse_indexing(project_env, place_id=12345) -def test_analyse_indexing_with_osm_id(temp_db_conn, temp_db_cursor): +def test_analyse_indexing_with_osm_id(project_env, temp_db_cursor): temp_db_cursor.execute("""INSERT INTO placex (place_id, osm_type, osm_id) VALUES(9988, 'N', 10000)""") - admin.analyse_indexing(temp_db_conn, osm_id='N10000') + admin.analyse_indexing(project_env, osm_id='N10000') + + +class TestAdminCleanDeleted: + + @pytest.fixture(autouse=True) + def setup_polygon_delete(self, project_env, table_factory, place_table, osmline_table, temp_db_cursor, temp_db_conn, def_config, src_dir): + """ Set up place_force_delete function and related tables + """ + self.project_env = project_env + self.temp_db_cursor = temp_db_cursor + table_factory('import_polygon_delete', + """osm_id BIGINT, + osm_type CHAR(1), + class TEXT NOT NULL, + type TEXT NOT NULL""", + ((100, 'N', 'boundary', 'administrative'), + (145, 'N', 'boundary', 'administrative'), + (175, 'R', 'landcover', 'grass'))) + temp_db_cursor.execute("""INSERT INTO placex (place_id, osm_id, osm_type, class, type, indexed_date, indexed_status) + VALUES(1, 100, 'N', 'boundary', 'administrative', current_date - INTERVAL '1 month', 1), + (2, 145, 'N', 'boundary', 'administrative', current_date - INTERVAL '3 month', 1), + (3, 175, 'R', 'landcover', 'grass', current_date - INTERVAL '3 months', 1)""") + # set up tables and triggers for utils function + table_factory('place_to_be_deleted', + """osm_id BIGINT, + osm_type CHAR(1), + class TEXT NOT NULL, + type TEXT NOT NULL, + deferred BOOLEAN""") + table_factory('country_name', 'partition INT') + table_factory('import_polygon_error', """osm_id BIGINT, + osm_type CHAR(1), + class TEXT NOT NULL, + type TEXT NOT NULL""") + temp_db_cursor.execute("""CREATE OR REPLACE FUNCTION place_delete() + RETURNS TRIGGER AS $$ + BEGIN RETURN NULL; END; + $$ 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 + + + def test_admin_clean_deleted_no_records(self): + admin.clean_deleted_relations(self.project_env, age='1 year') + assert self.temp_db_cursor.row_set('SELECT osm_id, osm_type, class, type, indexed_status FROM placex') == {(100, 'N', 'boundary', 'administrative', 1), + (145, 'N', 'boundary', 'administrative', 1), + (175, 'R', 'landcover', 'grass', 1)} + assert self.temp_db_cursor.table_rows('import_polygon_delete') == 3 + + + @pytest.mark.parametrize('test_age', ['T week', '1 welk', 'P1E']) + def test_admin_clean_deleted_bad_age(self, test_age): + with pytest.raises(UsageError): + admin.clean_deleted_relations(self.project_env, age = test_age) + + + def test_admin_clean_deleted_partial(self): + admin.clean_deleted_relations(self.project_env, age = '2 months') + assert self.temp_db_cursor.row_set('SELECT osm_id, osm_type, class, type, indexed_status FROM placex') == {(100, 'N', 'boundary', 'administrative', 1), + (145, 'N', 'boundary', 'administrative', 100), + (175, 'R', 'landcover', 'grass', 100)} + assert self.temp_db_cursor.table_rows('import_polygon_delete') == 1 + + @pytest.mark.parametrize('test_age', ['1 week', 'P3D', '5 hours']) + def test_admin_clean_deleted(self, test_age): + admin.clean_deleted_relations(self.project_env, age = test_age) + assert self.temp_db_cursor.row_set('SELECT osm_id, osm_type, class, type, indexed_status FROM placex') == {(100, 'N', 'boundary', 'administrative', 100), + (145, 'N', 'boundary', 'administrative', 100), + (175, 'R', 'landcover', 'grass', 100)} + assert self.temp_db_cursor.table_rows('import_polygon_delete') == 0