From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 1 Dec 2020 21:23:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~192
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a4ba79fe780e521cb3f1958dd1a22238b85aa9f5?hp=825e19480891f7ad3dd368056e4db5ef902e97a5

Merge remote-tracking branch 'upstream/master'
---

diff --git a/sql/functions/address_lookup.sql b/sql/functions/address_lookup.sql
index c1a7b7a4..a2b7c90a 100644
--- a/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@ -111,7 +111,7 @@ BEGIN
   --then query tiger data
   -- %NOTIGERDATA% IF 0 THEN
   IF place IS NULL AND in_housenumber >= 0 THEN
-    SELECT parent_place_id as place_id, 'us' as country_code,
+    SELECT parent_place_id as place_id, 'us'::varchar(2) as country_code,
            in_housenumber::text as housenumber, postcode,
            'place' as class, 'house' as type,
            null::hstore as name, null::hstore as address,
@@ -125,7 +125,7 @@ BEGIN
 
   -- %NOAUXDATA% IF 0 THEN
   IF place IS NULL THEN
-    SELECT parent_place_id as place_id, 'us' as country_code,
+    SELECT parent_place_id as place_id, 'us'::varchar(2) as country_code,
            housenumber, postcode,
            'place' as class, 'house' as type,
            null::hstore as name, null::hstore as address,
@@ -191,7 +191,7 @@ BEGIN
 --RAISE WARNING '%',location;
     IF location.rank_address < 4 THEN
       -- no country locations for ranks higher than country
-      place.country_code := NULL;
+      place.country_code := NULL::varchar(2);
     ELSEIF place.country_code IS NULL AND location.country_code IS NOT NULL THEN
       place.country_code := location.country_code;
     END IF;