release 4.5.0.post3

[nominatim.git] / test / python / mocks.py

diff --git a/test/python/mocks.py b/test/python/mocks.py
index 9c6ef53215dd91c24368a6153385da9011f52445..cde0b7bb58e8fdab6208ca6cef05d10c179535ff 100644 (file)
--- 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)
 #
 #
 # 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
 
 # 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
 
 # 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,
                                admin_level smallint,
                                address hstore,
                                extratags hstore,

+                               token_info jsonb,

                                geometry Geometry(Geometry,4326),
                                wikipedia TEXT,
                                country_code varchar(2),
                                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)',
 
     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:
         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,
             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)
                                                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,
                         (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()
 
                          country))
         self.conn.commit()