cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes IP address function naming and another CBD typo in postal codes

Browse Source
This commit is contained in:
Carla Iriberri
2015-11-17 12:26:18 +01:00
parent 7cba8fd679
commit c7b6db3560
8 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/sql/0.0.1/50_ipaddresses.sql
View File

@@ -4,13 +4,13 @@
-- These are the only ones with permissions to publicuser role
-- and should also be the only ones with SECURITY DEFINER
---- geocode_ip(city_name text)
CREATE OR REPLACE FUNCTION cdb_geocoder_client.geocode_ip(ip_address text)
---- geocode_ipaddress_point(city_name text)
CREATE OR REPLACE FUNCTION cdb_geocoder_client.geocode_ipaddress_point(ip_address text)
RETURNS Geometry AS $$
DECLARE
ret Geometry;
BEGIN
SELECT cdb_geocoder_client._geocode_ip(session_user, txid_current(), ip_address) INTO ret;
SELECT cdb_geocoder_client._geocode_ipaddress_point(session_user, txid_current(), ip_address) INTO ret;
RETURN ret;
END;
$$ LANGUAGE 'plpgsql' SECURITY DEFINER;
@@ -19,9 +19,9 @@ $$ LANGUAGE 'plpgsql' SECURITY DEFINER;
--------------------------------------------------------------------------------
---- geocode_ip(ip_address text)
CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_ip(user_id name, tx_id bigint, ip_address text)
---- geocode_ipaddress_point(ip_address text)
CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_ipaddress_point(user_id name, tx_id bigint, ip_address text)
RETURNS Geometry AS $$
CONNECT cdb_geocoder_client._server_conn_str();
SELECT cdb_geocoder_server.geocode_ip(user_id, tx_id, ip_address);
SELECT cdb_geocoder_server.geocode_ipaddress_point(user_id, tx_id, ip_address);
$$ LANGUAGE plproxy;

2
client/sql/0.0.1/90_permissions.sql
View File

@@ -20,4 +20,4 @@ GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_namedplace_point(city_name
GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_namedplace_point(city_name text, admin1_name text, country_name text) TO publicuser;
GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_postalcode_polygon(postal_code text, country_name text) TO publicuser;
GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_postalcode_point(postal_code text, country_name text) TO publicuser;
GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_ip(ip_address text) TO publicuser;
GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_ipaddress_point(ip_address text) TO publicuser;