X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/5ff35d998459260e60bcb01aa7302f4706d043b1..8e8f7a641b8b2eadd99e8e3198f762a3c3ebfd67:/test/python/mocks.py diff --git a/test/python/mocks.py b/test/python/mocks.py index 9c6ef532..cde0b7bb 100644 --- a/test/python/mocks.py +++ b/test/python/mocks.py @@ -1,17 +1,15 @@ -# SPDX-License-Identifier: GPL-2.0-only +# SPDX-License-Identifier: GPL-3.0-or-later # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2022 by the Nominatim developer community. +# Copyright (C) 2024 by the Nominatim developer community. # For a full list of authors see the git log. """ Custom mocks for testing. """ import itertools -import psycopg2.extras - -from nominatim.db import properties +from nominatim_db.db import properties # This must always point to the mock word table for the default tokenizer. from mock_icu_word_table import MockIcuWordTable as MockWordTable @@ -42,6 +40,7 @@ class MockPlacexTable: admin_level smallint, address hstore, extratags hstore, + token_info jsonb, geometry Geometry(Geometry,4326), wikipedia TEXT, country_code varchar(2), @@ -53,16 +52,16 @@ class MockPlacexTable: def add(self, osm_type='N', osm_id=None, cls='amenity', typ='cafe', names=None, admin_level=None, address=None, extratags=None, geom='POINT(10 4)', - country=None, housenumber=None): + country=None, housenumber=None, rank_search=30): with self.conn.cursor() as cur: - psycopg2.extras.register_hstore(cur) cur.execute("""INSERT INTO placex (place_id, osm_type, osm_id, class, type, name, admin_level, address, - housenumber, + housenumber, rank_search, extratags, geometry, country_code) - VALUES(nextval('seq_place'), %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)""", + VALUES(nextval('seq_place'), %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)""", (osm_type, osm_id or next(self.idseq), cls, typ, names, - admin_level, address, housenumber, extratags, 'SRID=4326;' + geom, + admin_level, address, housenumber, rank_search, + extratags, 'SRID=4326;' + geom, country)) self.conn.commit()