Merge remote-tracking branch 'upstream/master'

diff --combined sql/functions/address_lookup.sql
index c1a7b7a4fffcb0e555cc1bfbf5de7cef1516bafe,34ef7ca75b6cf1dbb669313d8eee5e577caa9e16..a2b7c90aae696534aa8f7dd2446f971f12475720
--- 1/sql/functions/address_lookup.sql
--- 2/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@@ -111,7 -111,7 +111,7 @@@ BEGI
    --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 +125,7 @@@
  
    -- %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 +191,7 @@@
  --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;
@@@ -211,7 -211,7 +211,7 @@@
    FOR location IN
      SELECT placex.place_id, osm_type, osm_id, name, class, type,
             coalesce(extratags->'linked_place', extratags->'place') as place_type,
 -           admin_level, fromarea, isaddress,
 +           admin_level, fromarea, isaddress and linked_place_id is NULL as isaddress,
             CASE WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address,
             distance, country_code, postcode
        FROM place_addressline join placex on (address_place_id = placex.place_id)