From 383e3ccd2578bf8aa75849c4f60776ddb648082e Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Wed, 15 Nov 2023 17:45:12 +0100 Subject: [PATCH 1/2] php frontend: fix on-the-fly lookup of postcode areas --- lib-sql/functions/address_lookup.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib-sql/functions/address_lookup.sql b/lib-sql/functions/address_lookup.sql index 5d2cb94d..26ce2073 100644 --- a/lib-sql/functions/address_lookup.sql +++ b/lib-sql/functions/address_lookup.sql @@ -262,7 +262,7 @@ BEGIN -- If the place had a postcode assigned, take this one only -- into consideration when it is an area and the place does not have -- a postcode itself. - IF location.fromarea AND location.isaddress + IF location.fromarea AND location_isaddress AND (place.address is null or not place.address ? 'postcode') THEN place.postcode := null; -- remove the less exact postcode From 9a1b8a67d63d28059c716e59ec305fa2bfede33a Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Wed, 15 Nov 2023 19:59:26 +0100 Subject: [PATCH 2/2] adapt typing to newest version of SQLAlchemy --- nominatim/db/connection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nominatim/db/connection.py b/nominatim/db/connection.py index a64cbfaf..fce897bc 100644 --- a/nominatim/db/connection.py +++ b/nominatim/db/connection.py @@ -31,7 +31,7 @@ class Cursor(psycopg2.extras.DictCursor): """ Query execution that logs the SQL query when debugging is enabled. """ if LOG.isEnabledFor(logging.DEBUG): - LOG.debug(self.mogrify(query, args).decode('utf-8')) # type: ignore[arg-type] + LOG.debug(self.mogrify(query, args).decode('utf-8')) super().execute(query, args)