From c7b6db3560e412ab87399bb1b658b04eff2ad976 Mon Sep 17 00:00:00 2001 From: Carla Iriberri Date: Tue, 17 Nov 2015 12:26:18 +0100 Subject: [PATCH] Fixes IP address function naming and another CBD typo in postal codes --- client/expected/40_postalcodes_test.out | 8 ++++---- client/expected/50_ipaddresses_test.out | 16 ++++++++-------- client/expected/90_permissions_test.out | 20 ++++++++++---------- client/sql/0.0.1/50_ipaddresses.sql | 12 ++++++------ client/sql/0.0.1/90_permissions.sql | 2 +- client/sql/40_postalcodes_test.sql | 4 ++-- client/sql/50_ipaddresses_test.sql | 6 +++--- client/sql/90_permissions_test.sql | 4 ++-- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/client/expected/40_postalcodes_test.out b/client/expected/40_postalcodes_test.out index f179483..7b3b824 100644 --- a/client/expected/40_postalcodes_test.out +++ b/client/expected/40_postalcodes_test.out @@ -2,20 +2,20 @@ CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_postalcode_polygon(user_id name, tx_id bigint, postal_code text, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_postalcode_polygon invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_postalcode_polygon invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_postalcode_point(user_id name, tx_id bigint, postal_code text, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_postalcode_point invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_postalcode_point invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; -- Exercise the public and the proxied function SELECT cdb_geocoder_client.geocode_postalcode_polygon('03204', 'Spain'); -NOTICE: cdb_geocoder_client._geocode_postalcode_polygon(4): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_postalcode_polygon invoked with params (postgres, some_transaction_id, 03204, Spain) +NOTICE: cdb_geocoder_client._geocode_postalcode_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_postalcode_polygon invoked with params (postgres, some_transaction_id, 03204, Spain) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_postalcode_polygon(session_user, txid_current(), postal_code, country_name)" PL/pgSQL function cdb_geocoder_client.geocode_postalcode_polygon(text,text) line 5 at SQL statement geocode_postalcode_polygon @@ -24,7 +24,7 @@ PL/pgSQL function cdb_geocoder_client.geocode_postalcode_polygon(text,text) line (1 row) SELECT cdb_geocoder_client.geocode_postalcode_point('03204', 'Spain'); -NOTICE: cdb_geocoder_client._geocode_postalcode_point(4): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_postalcode_polygon invoked with params (postgres, some_transaction_id, 03204, Spain) +NOTICE: cdb_geocoder_client._geocode_postalcode_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_postalcode_polygon invoked with params (postgres, some_transaction_id, 03204, Spain) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_postalcode_point(session_user, txid_current(), postal_code, country_name)" PL/pgSQL function cdb_geocoder_client.geocode_postalcode_point(text,text) line 5 at SQL statement geocode_postalcode_point diff --git a/client/expected/50_ipaddresses_test.out b/client/expected/50_ipaddresses_test.out index 05f6e75..ef79b1a 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_ip(user_id name, tx_id bigint, ip_address text) +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_ipaddress_point(user_id name, tx_id bigint, ip_address text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_ip invoked with params (%, %, %)', user_id, 'some_transaction_id', ip_address; + RAISE NOTICE 'cdb_geocoder_server.geocode_ipaddress_point invoked with params (%, %, %)', user_id, 'some_transaction_id', ip_address; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; -- Exercise the public and the proxied function -SELECT cdb_geocoder_client.geocode_ip('8.8.8.8'); -NOTICE: cdb_geocoder_client._geocode_ip(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_ip invoked with params (postgres, some_transaction_id, 8.8.8.8) -CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_ip(session_user, txid_current(), ip_address)" -PL/pgSQL function cdb_geocoder_client.geocode_ip(text) line 5 at SQL statement - geocode_ip ------------- +SELECT cdb_geocoder_client.geocode_ipaddress_point('8.8.8.8'); +NOTICE: cdb_geocoder_client._geocode_ipaddress_point(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_ipaddress_point invoked with params (postgres, some_transaction_id, 8.8.8.8) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_ipaddress_point(session_user, txid_current(), ip_address)" +PL/pgSQL function cdb_geocoder_client.geocode_ipaddress_point(text) line 5 at SQL statement + geocode_ipaddress_point +------------------------- (1 row) diff --git a/client/expected/90_permissions_test.out b/client/expected/90_permissions_test.out index 3077bd4..951d19f 100644 --- a/client/expected/90_permissions_test.out +++ b/client/expected/90_permissions_test.out @@ -57,7 +57,7 @@ PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text,text,text) l (1 row) SELECT cdb_geocoder_client.geocode_postalcode_polygon('03204', 'Spain'); -NOTICE: cdb_geocoder_client._geocode_postalcode_polygon(4): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_postalcode_polygon invoked with params (postgres, some_transaction_id, 03204, Spain) +NOTICE: cdb_geocoder_client._geocode_postalcode_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_postalcode_polygon invoked with params (postgres, some_transaction_id, 03204, Spain) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_postalcode_polygon(session_user, txid_current(), postal_code, country_name)" PL/pgSQL function cdb_geocoder_client.geocode_postalcode_polygon(text,text) line 5 at SQL statement geocode_postalcode_polygon @@ -66,7 +66,7 @@ PL/pgSQL function cdb_geocoder_client.geocode_postalcode_polygon(text,text) line (1 row) SELECT cdb_geocoder_client.geocode_postalcode_point('03204', 'Spain'); -NOTICE: cdb_geocoder_client._geocode_postalcode_point(4): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_postalcode_polygon invoked with params (postgres, some_transaction_id, 03204, Spain) +NOTICE: cdb_geocoder_client._geocode_postalcode_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_postalcode_polygon invoked with params (postgres, some_transaction_id, 03204, Spain) CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_postalcode_point(session_user, txid_current(), postal_code, country_name)" PL/pgSQL function cdb_geocoder_client.geocode_postalcode_point(text,text) line 5 at SQL statement geocode_postalcode_point @@ -74,12 +74,12 @@ PL/pgSQL function cdb_geocoder_client.geocode_postalcode_point(text,text) line 5 (1 row) -SELECT cdb_geocoder_client.geocode_ip('8.8.8.8'); -NOTICE: cdb_geocoder_client._geocode_ip(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, 8.8.8.8) -CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_ip(session_user, txid_current(), ip_address)" -PL/pgSQL function cdb_geocoder_client.geocode_ip(text) line 5 at SQL statement - geocode_ip ------------- +SELECT cdb_geocoder_client.geocode_ipaddress_point('8.8.8.8'); +NOTICE: cdb_geocoder_client._geocode_ipaddress_point(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.geocode_ipaddress_point invoked with params (postgres, some_transaction_id, 8.8.8.8) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_ipaddress_point(session_user, txid_current(), ip_address)" +PL/pgSQL function cdb_geocoder_client.geocode_ipaddress_point(text) line 5 at SQL statement + geocode_ipaddress_point +------------------------- (1 row) @@ -100,8 +100,8 @@ SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, '66666' ERROR: permission denied for function _geocode_postalcode_polygon SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', 666, '66666', 'Hell'); ERROR: permission denied for function _geocode_postalcode_point -SELECT cdb_geocoder_client._geocode_ip('evil_user', 666, '8.8.8.8'); -ERROR: permission denied for function _geocode_ip +SELECT cdb_geocoder_client._geocode_ipaddress_point('evil_user', 666, '8.8.8.8'); +ERROR: permission denied for function _geocode_ipaddress_point -- Check the regular user cannot look into config table SELECT * from cdb_geocoder_client._config; ERROR: permission denied for relation _config diff --git a/client/sql/0.0.1/50_ipaddresses.sql b/client/sql/0.0.1/50_ipaddresses.sql index c7b0c53..60602ab 100644 --- a/client/sql/0.0.1/50_ipaddresses.sql +++ b/client/sql/0.0.1/50_ipaddresses.sql @@ -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; diff --git a/client/sql/0.0.1/90_permissions.sql b/client/sql/0.0.1/90_permissions.sql index eaeaef0..9fea793 100644 --- a/client/sql/0.0.1/90_permissions.sql +++ b/client/sql/0.0.1/90_permissions.sql @@ -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; diff --git a/client/sql/40_postalcodes_test.sql b/client/sql/40_postalcodes_test.sql index 8181808..a93425e 100644 --- a/client/sql/40_postalcodes_test.sql +++ b/client/sql/40_postalcodes_test.sql @@ -2,7 +2,7 @@ CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_postalcode_polygon(user_id name, tx_id bigint, postal_code text, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_postalcode_polygon invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_postalcode_polygon invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; @@ -10,7 +10,7 @@ $$ LANGUAGE 'plpgsql'; CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_postalcode_point(user_id name, tx_id bigint, postal_code text, country_name text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_postalcode_point invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; + RAISE NOTICE 'cdb_geocoder_server.geocode_postalcode_point invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; diff --git a/client/sql/50_ipaddresses_test.sql b/client/sql/50_ipaddresses_test.sql index 63d43fd..2007820 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_ip(user_id name, tx_id bigint, ip_address text) +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_ipaddress_point(user_id name, tx_id bigint, ip_address text) RETURNS Geometry AS $$ BEGIN - RAISE NOTICE 'cbd_geocoder_server.geocode_ip invoked with params (%, %, %)', user_id, 'some_transaction_id', ip_address; + RAISE NOTICE 'cdb_geocoder_server.geocode_ipaddress_point invoked with params (%, %, %)', user_id, 'some_transaction_id', ip_address; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; -- Exercise the public and the proxied function -SELECT cdb_geocoder_client.geocode_ip('8.8.8.8'); +SELECT cdb_geocoder_client.geocode_ipaddress_point('8.8.8.8'); diff --git a/client/sql/90_permissions_test.sql b/client/sql/90_permissions_test.sql index 6f160fa..ecbc466 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_ip('8.8.8.8'); +SELECT cdb_geocoder_client.geocode_ipaddress_point('8.8.8.8'); -- Check the regular user has no permissions on private functions SELECT cdb_geocoder_client._geocode_admin0_polygon('evil_user', 666, 'Hell'); @@ -22,7 +22,7 @@ SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol', SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol', 'Hell', 'Ugly world'); SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, '66666', 'Hell'); SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', 666, '66666', 'Hell'); -SELECT cdb_geocoder_client._geocode_ip('evil_user', 666, '8.8.8.8'); +SELECT cdb_geocoder_client._geocode_ipaddress_point('evil_user', 666, '8.8.8.8'); -- Check the regular user cannot look into config table SELECT * from cdb_geocoder_client._config;