Merge pull request #2090 from lonvia/avoid-contains-operator

[nominatim.git] / sql / functions / address_lookup.sql

diff --git a/sql/functions/address_lookup.sql b/sql/functions/address_lookup.sql
index dfd5a9530d88d9798bc0d6b48d325f200d409c7c..34ef7ca75b6cf1dbb669313d8eee5e577caa9e16 100644 (file)
--- 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
   --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,
            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
 
   -- %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,
            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
 --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;
     ELSEIF place.country_code IS NULL AND location.country_code IS NOT NULL THEN
       place.country_code := location.country_code;
     END IF;