From 88c1bee0e3101e18a2c8ed864bec5cdf5407b906 Mon Sep 17 00:00:00 2001 From: Carla Date: Mon, 2 Nov 2015 12:06:05 +0100 Subject: [PATCH 1/3] Updating function for global table --- geocoder/postal-codes/sql/geocoder.sql | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/geocoder/postal-codes/sql/geocoder.sql b/geocoder/postal-codes/sql/geocoder.sql index d83f2f8..075c556 100644 --- a/geocoder/postal-codes/sql/geocoder.sql +++ b/geocoder/postal-codes/sql/geocoder.sql @@ -136,8 +136,9 @@ $$ LANGUAGE 'plpgsql' SECURITY DEFINER; --SELECT (geocode_postalcode_polygons(Array['10013','G9H','03782'], Array['USA', 'Canada', 'US'])).* -- codes array, countries array -CREATE OR REPLACE FUNCTION geocode_postalcode_polygons(code text[], inputcountries text[]) - RETURNS SETOF geocode_namedplace_country_v1 AS $$ +CREATE FUNCTION geocode_postalcode_polygons(code text[], inputcountries text[]) RETURNS SETOF geocode_namedplace_country_v1 + LANGUAGE plpgsql SECURITY DEFINER + AS $$ DECLARE ret geocode_namedplace_country_v1%rowtype; adm text[]; @@ -152,9 +153,9 @@ CREATE OR REPLACE FUNCTION geocode_postalcode_polygons(code text[], inputcountri SELECT q, c, ( SELECT the_geom - FROM postal_code_polygons + FROM global_postal_code_polygons WHERE postal_code = CASE WHEN a = 'CAN' THEN substring(upper(d.q) from 1 for 3) ELSE upper(d.q) END - AND adm0_a3 = a + AND iso3 = a ) geom FROM (SELECT unnest(code) q, unnest(inputcountries) c, unnest(adm) a) d ) v From 5b1e1890785e18f3fec73d5be909fda974019e0f Mon Sep 17 00:00:00 2001 From: Carla Date: Mon, 2 Nov 2015 12:09:29 +0100 Subject: [PATCH 2/3] Update geocoder.sql --- geocoder/postal-codes/sql/geocoder.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geocoder/postal-codes/sql/geocoder.sql b/geocoder/postal-codes/sql/geocoder.sql index 075c556..086e72e 100644 --- a/geocoder/postal-codes/sql/geocoder.sql +++ b/geocoder/postal-codes/sql/geocoder.sql @@ -29,7 +29,7 @@ CREATE OR REPLACE FUNCTION geocode_postalcode_points(code text[], inputcountry t END LOOP; RETURN; END -$$ LANGUAGE 'plpgsql' SECURITY DEFINER; +$$; -- codes array, countries array From c689587a2381f5adf91f31ead58d14af579e31de Mon Sep 17 00:00:00 2001 From: Carla Date: Mon, 2 Nov 2015 12:10:19 +0100 Subject: [PATCH 3/3] Update geocoder.sql --- geocoder/postal-codes/sql/geocoder.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/geocoder/postal-codes/sql/geocoder.sql b/geocoder/postal-codes/sql/geocoder.sql index 086e72e..5bce401 100644 --- a/geocoder/postal-codes/sql/geocoder.sql +++ b/geocoder/postal-codes/sql/geocoder.sql @@ -29,7 +29,7 @@ CREATE OR REPLACE FUNCTION geocode_postalcode_points(code text[], inputcountry t END LOOP; RETURN; END -$$; +$$ LANGUAGE 'plpgsql' SECURITY DEFINER; -- codes array, countries array @@ -164,7 +164,7 @@ CREATE FUNCTION geocode_postalcode_polygons(code text[], inputcountries text[]) END LOOP; RETURN; END -$$ LANGUAGE 'plpgsql' SECURITY DEFINER; +$$; -- codes array integers, countries array