From b57dc82f422ae3cd8b531936dc58ebf3347828e2 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Tue, 24 Nov 2015 09:25:21 +0100 Subject: [PATCH] Change ipaddress geocode to match the server signature --- client/expected/50_ipaddresses_test.out | 16 ++++++++-------- client/expected/90_permissions_test.out | 16 ++++++++-------- client/sql/50_ipaddresses_test.sql | 6 +++--- client/sql/90_permissions_test.sql | 4 ++-- interface.yaml | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/client/expected/50_ipaddresses_test.out b/client/expected/50_ipaddresses_test.out index 319032e..2606960 100644 --- a/client/expected/50_ipaddresses_test.out +++ b/client/expected/50_ipaddresses_test.out @@ -1,18 +1,18 @@ -- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_ipaddress_point(user_id name, user_config JSON, geocoder_config JSON, ip_address text) +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_ip_point(user_id name, user_config JSON, geocoder_config JSON, ip_address text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cdb_geocoder_server.geocode_ipaddress_point invoked with params (%, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', ip_address; + RAISE NOTICE 'cdb_geocoder_server.geocode_ip_point invoked with params (%, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', ip_address; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; -- Exercise the public and the proxied function -SELECT cdb_geocoder_client.geocode_ipaddress_point('8.8.8.8'); -NOTICE: cdb_geocoder_client._geocode_ipaddress_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_ipaddress_point invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, 8.8.8.8) -CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_ipaddress_point(session_user, user_config, geocoder_config, ip_address)" -PL/pgSQL function cdb_geocoder_client.geocode_ipaddress_point(text) line 9 at SQL statement - geocode_ipaddress_point -------------------------- +SELECT cdb_geocoder_client.geocode_ip_point('8.8.8.8'); +NOTICE: cdb_geocoder_client._geocode_ip_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_ip_point invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, 8.8.8.8) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_ip_point(session_user, user_config, geocoder_config, ip_address)" +PL/pgSQL function cdb_geocoder_client.geocode_ip_point(text) line 9 at SQL statement + geocode_ip_point +------------------ (1 row) diff --git a/client/expected/90_permissions_test.out b/client/expected/90_permissions_test.out index e36b005..9820db3 100644 --- a/client/expected/90_permissions_test.out +++ b/client/expected/90_permissions_test.out @@ -74,12 +74,12 @@ PL/pgSQL function cdb_geocoder_client.geocode_postalcode_point(text,text) line 9 (1 row) -SELECT cdb_geocoder_client.geocode_ipaddress_point('8.8.8.8'); -NOTICE: cdb_geocoder_client._geocode_ipaddress_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_ipaddress_point invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, 8.8.8.8) -CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_ipaddress_point(session_user, user_config, geocoder_config, ip_address)" -PL/pgSQL function cdb_geocoder_client.geocode_ipaddress_point(text) line 9 at SQL statement - geocode_ipaddress_point -------------------------- +SELECT cdb_geocoder_client.geocode_ip_point('8.8.8.8'); +NOTICE: cdb_geocoder_client._geocode_ip_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_ip_point invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, 8.8.8.8) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_ip_point(session_user, user_config, geocoder_config, ip_address)" +PL/pgSQL function cdb_geocoder_client.geocode_ip_point(text) line 9 at SQL statement + geocode_ip_point +------------------ (1 row) @@ -100,5 +100,5 @@ SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', '{"is_organi ERROR: permission denied for function _geocode_postalcode_polygon SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '66666', 'Hell'); ERROR: permission denied for function _geocode_postalcode_point -SELECT cdb_geocoder_client._geocode_ipaddress_point('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '8.8.8.8'); -ERROR: permission denied for function _geocode_ipaddress_point +SELECT cdb_geocoder_client._geocode_ip_point('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '8.8.8.8'); +ERROR: permission denied for function _geocode_ip_point diff --git a/client/sql/50_ipaddresses_test.sql b/client/sql/50_ipaddresses_test.sql index bfbf126..9ec04a0 100644 --- a/client/sql/50_ipaddresses_test.sql +++ b/client/sql/50_ipaddresses_test.sql @@ -1,12 +1,12 @@ -- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_ipaddress_point(user_id name, user_config JSON, geocoder_config JSON, ip_address text) +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_ip_point(user_id name, user_config JSON, geocoder_config JSON, ip_address text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cdb_geocoder_server.geocode_ipaddress_point invoked with params (%, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', ip_address; + RAISE NOTICE 'cdb_geocoder_server.geocode_ip_point invoked with params (%, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', ip_address; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; -- Exercise the public and the proxied function -SELECT cdb_geocoder_client.geocode_ipaddress_point('8.8.8.8'); +SELECT cdb_geocoder_client.geocode_ip_point('8.8.8.8'); diff --git a/client/sql/90_permissions_test.sql b/client/sql/90_permissions_test.sql index 1973f8b..2c44412 100644 --- a/client/sql/90_permissions_test.sql +++ b/client/sql/90_permissions_test.sql @@ -11,7 +11,7 @@ SELECT cdb_geocoder_client.geocode_namedplace_point('Elx', 'Valencia'); SELECT cdb_geocoder_client.geocode_namedplace_point('Elx', 'Valencia', 'Spain'); SELECT cdb_geocoder_client.geocode_postalcode_polygon('03204', 'Spain'); SELECT cdb_geocoder_client.geocode_postalcode_point('03204', 'Spain'); -SELECT cdb_geocoder_client.geocode_ipaddress_point('8.8.8.8'); +SELECT cdb_geocoder_client.geocode_ip_point('8.8.8.8'); -- Check the regular user has no permissions on private functions SELECT cdb_geocoder_client._geocode_admin0_polygon('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Hell'); @@ -22,4 +22,4 @@ SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', '{"is_organiza SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Sheol', 'Hell', 'Ugly world'); SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '66666', 'Hell'); SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '66666', 'Hell'); -SELECT cdb_geocoder_client._geocode_ipaddress_point('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '8.8.8.8'); +SELECT cdb_geocoder_client._geocode_ip_point('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '8.8.8.8'); diff --git a/interface.yaml b/interface.yaml index 01b1cc0..0204789 100644 --- a/interface.yaml +++ b/interface.yaml @@ -62,7 +62,7 @@ - { name: postal_code, type: text} - { name: country_name, type: text} -- name: geocode_ipaddress_point +- name: geocode_ip_point return_type: Geometry user_config_key: user_config geocoder_config_key: geocoder_config