From d5268ee4ade43fef6671ed56bc26ca160018ba93 Mon Sep 17 00:00:00 2001 From: Carla Iriberri Date: Thu, 12 Nov 2015 15:06:17 +0100 Subject: [PATCH 1/4] Adds functions for admin1 --- client/expected/20_admin1_test.out | 34 ++++++++++++++++++++++ client/sql/0.0.1/20_admin1.sql | 45 ++++++++++++++++++++++++++++++ client/sql/20_admin1_test.sql | 21 ++++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 client/expected/20_admin1_test.out create mode 100644 client/sql/0.0.1/20_admin1.sql create mode 100644 client/sql/20_admin1_test.sql diff --git a/client/expected/20_admin1_test.out b/client/expected/20_admin1_test.out new file mode 100644 index 0000000..00ee342 --- /dev/null +++ b/client/expected/20_admin1_test.out @@ -0,0 +1,34 @@ +-- Mock the server functions +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin1_polygon(user_id name, tx_id bigint, admin1_name text) +RETURNS Geometry AS $$ +BEGIN + RAISE NOTICE 'cbd_geocoder_server.geocode_admin1_polygon invoked with params (%, %, %)', user_id, 'some_transaction_id', admin1_name; + RETURN NULL; +END; +$$ LANGUAGE 'plpgsql'; +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin1_polygon(user_id name, tx_id bigint, admin1_name text, country_name text) +RETURNS Geometry AS $$ +BEGIN + RAISE NOTICE 'cbd_geocoder_server.geocode_admin1_polygon invoked with params (%, %, %, %)', user_id, 'some_transaction_id', admin1_name, country_name; + RETURN NULL; +END; +$$ LANGUAGE 'plpgsql'; +-- Exercise the public and the proxied function +SELECT cdb_geocoder_client.geocode_admin1_polygon('California'); +NOTICE: cdb_geocoder_client._geocode_admin1_polygon(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_admin1_polygon invoked with params (postgres, some_transaction_id, California) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_admin1_polygon(session_user, txid_current(), admin1_name)" +PL/pgSQL function cdb_geocoder_client.geocode_admin1_polygon(text) line 5 at SQL statement + geocode_admin1_polygon +------------------------ + +(1 row) + +SELECT cdb_geocoder_client.geocode_admin1_polygon('California', 'United States'); +NOTICE: cdb_geocoder_client._geocode_admin1_polygon(4): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_admin1_polygon invoked with params (postgres, some_transaction_id, California, United States) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_admin1_polygon(session_user, txid_current(), admin1_name, country_name)" +PL/pgSQL function cdb_geocoder_client.geocode_admin1_polygon(text,text) line 5 at SQL statement + geocode_admin1_polygon +------------------------ + +(1 row) + diff --git a/client/sql/0.0.1/20_admin1.sql b/client/sql/0.0.1/20_admin1.sql new file mode 100644 index 0000000..f7d0088 --- /dev/null +++ b/client/sql/0.0.1/20_admin1.sql @@ -0,0 +1,45 @@ +-- +-- Public geocoder API function +-- +-- These are the only ones with permissions to publicuser role +-- and should also be the only ones with SECURITY DEFINER + +---- geocode_admin1_polygon(admin1_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client.geocode_admin1_polygon(admin1_name text) +RETURNS Geometry AS $$ +DECLARE + ret Geometry; +BEGIN + SELECT cdb_geocoder_client._geocode_admin1_polygon(session_user, txid_current(), admin1_name) INTO ret; + RETURN ret; +END; +$$ LANGUAGE 'plpgsql' SECURITY DEFINER; + +---- geocode_admin1_polygon(admin1_name text, country_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client.geocode_admin1_polygon(admin1_name text, country_name text) +RETURNS Geometry AS $$ +DECLARE + ret Geometry; +BEGIN + SELECT cdb_geocoder_client._geocode_admin1_polygon(session_user, txid_current(), admin1_name, country_name) INTO ret; + RETURN ret; +END; +$$ LANGUAGE 'plpgsql' SECURITY DEFINER; + +-- TODO: review all permissions stuff [I'd explicitly grant permissions to the public functions] + +-------------------------------------------------------------------------------- + +---- geocode_admin1_polygon(admin1_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_admin1_polygon(user_id name, tx_id bigint, admin1_name text) +RETURNS Geometry AS $$ + CONNECT cdb_geocoder_client._server_conn_str(); + SELECT cdb_geocoder_server.geocode_admin1_polygon(user_id, tx_id, admin1_name); +$$ LANGUAGE plproxy; + +---- geocode_admin1_polygon(admin1_name text, country_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_admin1_polygon(user_id name, tx_id bigint, admin1_name text, country_name text) +RETURNS Geometry AS $$ + CONNECT cdb_geocoder_client._server_conn_str(); + SELECT cdb_geocoder_server.geocode_admin1_polygon(user_id, tx_id, admin1_name, country_name); +$$ LANGUAGE plproxy; diff --git a/client/sql/20_admin1_test.sql b/client/sql/20_admin1_test.sql new file mode 100644 index 0000000..3ecbfe6 --- /dev/null +++ b/client/sql/20_admin1_test.sql @@ -0,0 +1,21 @@ +-- Mock the server functions +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin1_polygon(user_id name, tx_id bigint, admin1_name text) +RETURNS Geometry AS $$ +BEGIN + RAISE NOTICE 'cbd_geocoder_server.geocode_admin1_polygon invoked with params (%, %, %)', user_id, 'some_transaction_id', admin1_name; + RETURN NULL; +END; +$$ LANGUAGE 'plpgsql'; + +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin1_polygon(user_id name, tx_id bigint, admin1_name text, country_name text) +RETURNS Geometry AS $$ +BEGIN + RAISE NOTICE 'cbd_geocoder_server.geocode_admin1_polygon invoked with params (%, %, %, %)', user_id, 'some_transaction_id', admin1_name, country_name; + RETURN NULL; +END; +$$ LANGUAGE 'plpgsql'; + + +-- Exercise the public and the proxied function +SELECT cdb_geocoder_client.geocode_admin1_polygon('California'); +SELECT cdb_geocoder_client.geocode_admin1_polygon('California', 'United States'); From 5226af7c866b6f7601f83849e9398fe44f9ab6fe Mon Sep 17 00:00:00 2001 From: Carla Iriberri Date: Thu, 12 Nov 2015 18:45:27 +0100 Subject: [PATCH 2/4] Adds client functions for named places, pcodes and ips --- client/expected/30_namedplaces_test.out | 50 ++++++++++++++++++++ client/expected/40_postalcodes_test.out | 34 ++++++++++++++ client/expected/50_ipaddresses_test.out | 18 +++++++ client/sql/0.0.1/30_namedplaces.sql | 62 +++++++++++++++++++++++++ client/sql/0.0.1/40_postalcodes.sql | 45 ++++++++++++++++++ client/sql/0.0.1/50_ipaddresses.sql | 27 +++++++++++ client/sql/30_namedplaces_test.sql | 30 ++++++++++++ client/sql/40_postalcodes_test.sql | 20 ++++++++ client/sql/50_ipaddresses_test.sql | 12 +++++ 9 files changed, 298 insertions(+) create mode 100644 client/expected/30_namedplaces_test.out create mode 100644 client/expected/40_postalcodes_test.out create mode 100644 client/expected/50_ipaddresses_test.out create mode 100644 client/sql/0.0.1/30_namedplaces.sql create mode 100644 client/sql/0.0.1/40_postalcodes.sql create mode 100644 client/sql/0.0.1/50_ipaddresses.sql create mode 100644 client/sql/30_namedplaces_test.sql create mode 100644 client/sql/40_postalcodes_test.sql create mode 100644 client/sql/50_ipaddresses_test.sql diff --git a/client/expected/30_namedplaces_test.out b/client/expected/30_namedplaces_test.out new file mode 100644 index 0000000..7bbd2f8 --- /dev/null +++ b/client/expected/30_namedplaces_test.out @@ -0,0 +1,50 @@ +-- Mock the server functions +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_namedplace_point(user_id name, tx_id bigint, city_name text) +RETURNS Geometry AS $$ +BEGIN + RAISE NOTICE 'cbd_geocoder_server.geocode_namedplace_point invoked with params (%, %, %)', user_id, 'some_transaction_id', city_name; + RETURN NULL; +END; +$$ LANGUAGE 'plpgsql'; +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_namedplace_point(user_id name, tx_id bigint, city_name text, country_name text) +RETURNS Geometry AS $$ +BEGIN + RAISE NOTICE 'cbd_geocoder_server.geocode_namedplace_point invoked with params (%, %, %, %)', user_id, 'some_transaction_id', city_name, country_name; + RETURN NULL; +END; +$$ LANGUAGE 'plpgsql'; +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_namedplace_point(user_id name, tx_id bigint, city_name text, admin1_name text, country_name text) +RETURNS Geometry AS $$ +BEGIN + RAISE NOTICE 'cbd_geocoder_server.geocode_namedplace_point invoked with params (%, %, %, %, %)', user_id, 'some_transaction_id', city_name, admin1_name, country_name; + RETURN NULL; +END; +$$ LANGUAGE 'plpgsql'; +-- Exercise the public and the proxied function +SELECT cdb_geocoder_client.geocode_namedplace_point('Elx'); +NOTICE: cdb_geocoder_client._geocode_namedplace_point(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_namedplace_point(session_user, txid_current(), city_name)" +PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text) line 5 at SQL statement + geocode_namedplace_point +-------------------------- + +(1 row) + +SELECT cdb_geocoder_client.geocode_namedplace_point('Elx', 'Spain'); +NOTICE: cdb_geocoder_client._geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx, Spain) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_namedplace_point(session_user, txid_current(), city_name, country_name)" +PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text,text) line 5 at SQL statement + geocode_namedplace_point +-------------------------- + +(1 row) + +SELECT cdb_geocoder_client.geocode_namedplace_point('Elx', 'Valencia', 'Spain'); +NOTICE: cdb_geocoder_client._geocode_namedplace_point(5): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx, Valencia, Spain) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_namedplace_point(session_user, txid_current(), city_name, admin1_name, country_name)" +PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text,text,text) line 5 at SQL statement + geocode_namedplace_point +-------------------------- + +(1 row) + diff --git a/client/expected/40_postalcodes_test.out b/client/expected/40_postalcodes_test.out new file mode 100644 index 0000000..ec5a808 --- /dev/null +++ b/client/expected/40_postalcodes_test.out @@ -0,0 +1,34 @@ +-- Mock the server functions +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; + RETURN NULL; +END; +$$ LANGUAGE 'plpgsql'; +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_postalcode_polygon(user_id name, tx_id bigint, postal_code integer, 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; + 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) +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 +---------------------------- + +(1 row) + +SELECT cdb_geocoder_client.geocode_postalcode_polygon(3204, '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, 3204, 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(integer,text) line 5 at SQL statement + geocode_postalcode_polygon +---------------------------- + +(1 row) + diff --git a/client/expected/50_ipaddresses_test.out b/client/expected/50_ipaddresses_test.out new file mode 100644 index 0000000..badc382 --- /dev/null +++ b/client/expected/50_ipaddresses_test.out @@ -0,0 +1,18 @@ +-- Mock the server functions +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_ip(user_id name, tx_id bigint, ip_address text) +RETURNS Geometry AS $$ +BEGIN + RAISE NOTICE 'cbd_geocoder_server.geocode_namedplace_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_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 +------------ + +(1 row) + diff --git a/client/sql/0.0.1/30_namedplaces.sql b/client/sql/0.0.1/30_namedplaces.sql new file mode 100644 index 0000000..8ac6a9d --- /dev/null +++ b/client/sql/0.0.1/30_namedplaces.sql @@ -0,0 +1,62 @@ +-- +-- Public geocoder API function +-- +-- These are the only ones with permissions to publicuser role +-- and should also be the only ones with SECURITY DEFINER + +---- geocode_namedplace_point(city_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client.geocode_namedplace_point(city_name text) +RETURNS Geometry AS $$ +DECLARE + ret Geometry; +BEGIN + SELECT cdb_geocoder_client._geocode_namedplace_point(session_user, txid_current(), city_name) INTO ret; + RETURN ret; +END; +$$ LANGUAGE 'plpgsql' SECURITY DEFINER; + +---- geocode_namedplace_point(city_name text, country_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client.geocode_namedplace_point(city_name text, country_name text) +RETURNS Geometry AS $$ +DECLARE + ret Geometry; +BEGIN + SELECT cdb_geocoder_client._geocode_namedplace_point(session_user, txid_current(), city_name, country_name) INTO ret; + RETURN ret; +END; +$$ LANGUAGE 'plpgsql' SECURITY DEFINER; + +---- geocode_namedplace_point(city_name text, admin1_name text, country_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client.geocode_namedplace_point(city_name text, admin1_name text, country_name text) +RETURNS Geometry AS $$ +DECLARE + ret Geometry; +BEGIN + SELECT cdb_geocoder_client._geocode_namedplace_point(session_user, txid_current(), city_name, admin1_name, country_name) INTO ret; + RETURN ret; +END; +$$ LANGUAGE 'plpgsql' SECURITY DEFINER; +-- TODO: review all permissions stuff [I'd explicitly grant permissions to the public functions] + +-------------------------------------------------------------------------------- + +---- geocode_namedplace_point(city_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_namedplace_point(user_id name, tx_id bigint, city_name text) +RETURNS Geometry AS $$ + CONNECT cdb_geocoder_client._server_conn_str(); + SELECT cdb_geocoder_server.geocode_namedplace_point(user_id, tx_id, city_name); +$$ LANGUAGE plproxy; + +---- geocode_namedplace_point(city_name text, country_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_namedplace_point(user_id name, tx_id bigint, city_name text, country_name text) +RETURNS Geometry AS $$ + CONNECT cdb_geocoder_client._server_conn_str(); + SELECT cdb_geocoder_server.geocode_namedplace_point(user_id, tx_id, city_name, country_name); +$$ LANGUAGE plproxy; + +---- geocode_namedplace_point(city_name text, admin1_name text, country_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_namedplace_point(user_id name, tx_id bigint, city_name text, admin1_name text, country_name text) +RETURNS Geometry AS $$ + CONNECT cdb_geocoder_client._server_conn_str(); + SELECT cdb_geocoder_server.geocode_namedplace_point(user_id, tx_id, city_name, admin1_name, country_name); +$$ LANGUAGE plproxy; \ No newline at end of file diff --git a/client/sql/0.0.1/40_postalcodes.sql b/client/sql/0.0.1/40_postalcodes.sql new file mode 100644 index 0000000..26b404b --- /dev/null +++ b/client/sql/0.0.1/40_postalcodes.sql @@ -0,0 +1,45 @@ +-- +-- Public geocoder API function +-- +-- These are the only ones with permissions to publicuser role +-- and should also be the only ones with SECURITY DEFINER + +---- geocode_postalcode_polygon(postal_code text, country_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client.geocode_postalcode_polygon(postal_code text, country_name text) +RETURNS Geometry AS $$ +DECLARE + ret Geometry; +BEGIN + SELECT cdb_geocoder_client._geocode_postalcode_polygon(session_user, txid_current(), postal_code, country_name) INTO ret; + RETURN ret; +END; +$$ LANGUAGE 'plpgsql' SECURITY DEFINER; + +---- geocode_postalcode_polygon(postal_code integer, country_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client.geocode_postalcode_polygon(postal_code integer, country_name text) +RETURNS Geometry AS $$ +DECLARE + ret Geometry; +BEGIN + SELECT cdb_geocoder_client._geocode_postalcode_polygon(session_user, txid_current(), postal_code, country_name) INTO ret; + RETURN ret; +END; +$$ LANGUAGE 'plpgsql' SECURITY DEFINER; + +-- TODO: review all permissions stuff [I'd explicitly grant permissions to the public functions] + +-------------------------------------------------------------------------------- + +---- geocode_postalcode_polygon(postal_code text, country_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_postalcode_polygon(user_id name, tx_id bigint, postal_code text, country_name text) +RETURNS Geometry AS $$ + CONNECT cdb_geocoder_client._server_conn_str(); + SELECT cdb_geocoder_server.geocode_postalcode_polygon(user_id, tx_id, postal_code, country_name); +$$ LANGUAGE plproxy; + +---- geocode_postalcode_polygon(postal_code integer, country_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_postalcode_polygon(user_id name, tx_id bigint, postal_code integer, country_name text) +RETURNS Geometry AS $$ + CONNECT cdb_geocoder_client._server_conn_str(); + SELECT cdb_geocoder_server.geocode_postalcode_polygon(user_id, tx_id, postal_code, country_name); +$$ LANGUAGE plproxy; diff --git a/client/sql/0.0.1/50_ipaddresses.sql b/client/sql/0.0.1/50_ipaddresses.sql new file mode 100644 index 0000000..c7b0c53 --- /dev/null +++ b/client/sql/0.0.1/50_ipaddresses.sql @@ -0,0 +1,27 @@ +-- +-- Public geocoder API function +-- +-- 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) +RETURNS Geometry AS $$ +DECLARE + ret Geometry; +BEGIN + SELECT cdb_geocoder_client._geocode_ip(session_user, txid_current(), ip_address) INTO ret; + RETURN ret; +END; +$$ LANGUAGE 'plpgsql' SECURITY DEFINER; + +-- TODO: review all permissions stuff [I'd explicitly grant permissions to the public functions] + +-------------------------------------------------------------------------------- + +---- geocode_ip(ip_address text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_ip(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); +$$ LANGUAGE plproxy; diff --git a/client/sql/30_namedplaces_test.sql b/client/sql/30_namedplaces_test.sql new file mode 100644 index 0000000..f0f8004 --- /dev/null +++ b/client/sql/30_namedplaces_test.sql @@ -0,0 +1,30 @@ +-- Mock the server functions +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_namedplace_point(user_id name, tx_id bigint, city_name text) +RETURNS Geometry AS $$ +BEGIN + RAISE NOTICE 'cbd_geocoder_server.geocode_namedplace_point invoked with params (%, %, %)', user_id, 'some_transaction_id', city_name; + RETURN NULL; +END; +$$ LANGUAGE 'plpgsql'; + +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_namedplace_point(user_id name, tx_id bigint, city_name text, country_name text) +RETURNS Geometry AS $$ +BEGIN + RAISE NOTICE 'cbd_geocoder_server.geocode_namedplace_point invoked with params (%, %, %, %)', user_id, 'some_transaction_id', city_name, country_name; + RETURN NULL; +END; +$$ LANGUAGE 'plpgsql'; + +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_namedplace_point(user_id name, tx_id bigint, city_name text, admin1_name text, country_name text) +RETURNS Geometry AS $$ +BEGIN + RAISE NOTICE 'cbd_geocoder_server.geocode_namedplace_point invoked with params (%, %, %, %, %)', user_id, 'some_transaction_id', city_name, admin1_name, country_name; + RETURN NULL; +END; +$$ LANGUAGE 'plpgsql'; + +-- Exercise the public and the proxied function +SELECT cdb_geocoder_client.geocode_namedplace_point('Elx'); +SELECT cdb_geocoder_client.geocode_namedplace_point('Elx', 'Spain'); +SELECT cdb_geocoder_client.geocode_namedplace_point('Elx', 'Valencia', 'Spain'); + diff --git a/client/sql/40_postalcodes_test.sql b/client/sql/40_postalcodes_test.sql new file mode 100644 index 0000000..a402397 --- /dev/null +++ b/client/sql/40_postalcodes_test.sql @@ -0,0 +1,20 @@ +-- Mock the server functions +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; + RETURN NULL; +END; +$$ LANGUAGE 'plpgsql'; + +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_postalcode_polygon(user_id name, tx_id bigint, postal_code integer, 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; + RETURN NULL; +END; +$$ LANGUAGE 'plpgsql'; + +-- Exercise the public and the proxied function +SELECT cdb_geocoder_client.geocode_postalcode_polygon('03204', 'Spain'); +SELECT cdb_geocoder_client.geocode_postalcode_polygon(3204, 'Spain'); diff --git a/client/sql/50_ipaddresses_test.sql b/client/sql/50_ipaddresses_test.sql new file mode 100644 index 0000000..2b545f7 --- /dev/null +++ b/client/sql/50_ipaddresses_test.sql @@ -0,0 +1,12 @@ +-- Mock the server functions +CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_ip(user_id name, tx_id bigint, ip_address text) +RETURNS Geometry AS $$ +BEGIN + RAISE NOTICE 'cbd_geocoder_server.geocode_namedplace_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'); \ No newline at end of file From 50d1f502f7d0d1428c6a4846ccc021233b6b769c Mon Sep 17 00:00:00 2001 From: Carla Iriberri Date: Fri, 13 Nov 2015 12:32:36 +0100 Subject: [PATCH 3/4] Adds permissions and their tests --- client/expected/90_permissions_test.out | 88 +++++++++++++++++++++++++ client/sql/0.0.1/90_permissions.sql | 8 +++ client/sql/90_permissions_test.sql | 16 +++++ 3 files changed, 112 insertions(+) diff --git a/client/expected/90_permissions_test.out b/client/expected/90_permissions_test.out index b861802..63c0a9d 100644 --- a/client/expected/90_permissions_test.out +++ b/client/expected/90_permissions_test.out @@ -11,9 +11,97 @@ PL/pgSQL function cdb_geocoder_client.geocode_admin0_polygons(text) line 5 at SQ (1 row) +SELECT cdb_geocoder_client.geocode_admin1_polygon('California'); +NOTICE: cdb_geocoder_client._geocode_admin1_polygon(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_admin1_polygon invoked with params (postgres, some_transaction_id, California) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_admin1_polygon(session_user, txid_current(), admin1_name)" +PL/pgSQL function cdb_geocoder_client.geocode_admin1_polygon(text) line 5 at SQL statement + geocode_admin1_polygon +------------------------ + +(1 row) + +SELECT cdb_geocoder_client.geocode_admin1_polygon('California', 'United States'); +NOTICE: cdb_geocoder_client._geocode_admin1_polygon(4): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_admin1_polygon invoked with params (postgres, some_transaction_id, California, United States) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_admin1_polygon(session_user, txid_current(), admin1_name, country_name)" +PL/pgSQL function cdb_geocoder_client.geocode_admin1_polygon(text,text) line 5 at SQL statement + geocode_admin1_polygon +------------------------ + +(1 row) + +SELECT cdb_geocoder_client.geocode_namedplace_point('Elx'); +NOTICE: cdb_geocoder_client._geocode_namedplace_point(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_namedplace_point(session_user, txid_current(), city_name)" +PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text) line 5 at SQL statement + geocode_namedplace_point +-------------------------- + +(1 row) + +SELECT cdb_geocoder_client.geocode_namedplace_point('Elx', 'Valencia'); +NOTICE: cdb_geocoder_client._geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx, Valencia) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_namedplace_point(session_user, txid_current(), city_name, country_name)" +PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text,text) line 5 at SQL statement + geocode_namedplace_point +-------------------------- + +(1 row) + +SELECT cdb_geocoder_client.geocode_namedplace_point('Elx', 'Valencia', 'Spain'); +NOTICE: cdb_geocoder_client._geocode_namedplace_point(5): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_namedplace_point invoked with params (postgres, some_transaction_id, Elx, Valencia, Spain) +CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_namedplace_point(session_user, txid_current(), city_name, admin1_name, country_name)" +PL/pgSQL function cdb_geocoder_client.geocode_namedplace_point(text,text,text) line 5 at SQL statement + geocode_namedplace_point +-------------------------- + +(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) +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 +---------------------------- + +(1 row) + +SELECT cdb_geocoder_client.geocode_postalcode_polygon(3204, '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, 3204, 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(integer,text) line 5 at SQL statement + geocode_postalcode_polygon +---------------------------- + +(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 +------------ + +(1 row) + -- Check the regular user has no permissions on private functions SELECT cdb_geocoder_client._geocode_admin0_polygons('evil_user', 666, 'Hell'); ERROR: permission denied for function _geocode_admin0_polygons +SELECT cdb_geocoder_client._geocode_admin1_polygon('evil_user', 666, 'Hell'); +ERROR: permission denied for function _geocode_admin1_polygon +SELECT cdb_geocoder_client._geocode_admin1_polygon('evil_user', 666, 'Sheol', 'Hell'); +ERROR: permission denied for function _geocode_admin1_polygon +SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol'); +ERROR: permission denied for function _geocode_namedplace_point +SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol', 'Hell'); +ERROR: permission denied for function _geocode_namedplace_point +SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol', 'Hell', 'Ugly world'); +ERROR: permission denied for function _geocode_namedplace_point +SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, '66666', 'Hell'); +ERROR: permission denied for function _geocode_postalcode_polygon +SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, 66666, 'Hell'); +ERROR: permission denied for function _geocode_postalcode_polygon +SELECT cdb_geocoder_client._geocode_ip('evil_user', 666, '8.8.8.8'); +ERROR: permission denied for function _geocode_ip -- 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/90_permissions.sql b/client/sql/0.0.1/90_permissions.sql index 80d6cea..314df3f 100644 --- a/client/sql/0.0.1/90_permissions.sql +++ b/client/sql/0.0.1/90_permissions.sql @@ -13,3 +13,11 @@ REVOKE EXECUTE ON ALL FUNCTIONS IN SCHEMA cdb_geocoder_client FROM PUBLIC, publi -- Explicitly grant permissions to public functions -- NOTE: All public functions must be listed below, grating permissions to publicuser GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_admin0_polygons(country_name text) TO publicuser; +GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_admin1_polygon(admin1_name text) TO publicuser; +GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_admin1_polygon(admin1_name text, country_name text) TO publicuser; +GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_namedplace_point(city_name text) TO publicuser; +GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_namedplace_point(city_name text, country_name text) TO publicuser; +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_polygon(postal_code integer, country_name text) TO publicuser; +GRANT EXECUTE ON FUNCTION cdb_geocoder_client.geocode_ip(ip_address text) TO publicuser; diff --git a/client/sql/90_permissions_test.sql b/client/sql/90_permissions_test.sql index 1d6a39a..2385762 100644 --- a/client/sql/90_permissions_test.sql +++ b/client/sql/90_permissions_test.sql @@ -4,9 +4,25 @@ SET ROLE test_regular_user; -- Exercise the public function -- it is public, it shall work SELECT cdb_geocoder_client.geocode_admin0_polygons('Spain'); +SELECT cdb_geocoder_client.geocode_admin1_polygon('California'); +SELECT cdb_geocoder_client.geocode_admin1_polygon('California', 'United States'); +SELECT cdb_geocoder_client.geocode_namedplace_point('Elx'); +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_polygon(3204, 'Spain'); +SELECT cdb_geocoder_client.geocode_ip('8.8.8.8'); -- Check the regular user has no permissions on private functions SELECT cdb_geocoder_client._geocode_admin0_polygons('evil_user', 666, 'Hell'); +SELECT cdb_geocoder_client._geocode_admin1_polygon('evil_user', 666, 'Hell'); +SELECT cdb_geocoder_client._geocode_admin1_polygon('evil_user', 666, 'Sheol', 'Hell'); +SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol'); +SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol', 'Hell'); +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_polygon('evil_user', 666, 66666, 'Hell'); +SELECT cdb_geocoder_client._geocode_ip('evil_user', 666, '8.8.8.8'); -- Check the regular user cannot look into config table SELECT * from cdb_geocoder_client._config; From 91fab99084d6ee40ef41db754fc68ab4c4df3f45 Mon Sep 17 00:00:00 2001 From: Carla Iriberri Date: Fri, 13 Nov 2015 13:04:46 +0100 Subject: [PATCH 4/4] Uses proper postalcode functions and tests --- client/expected/40_postalcodes_test.out | 16 ++++++++-------- client/expected/90_permissions_test.out | 16 ++++++++-------- client/sql/0.0.1/40_postalcodes.sql | 8 ++++---- client/sql/0.0.1/90_permissions.sql | 2 +- client/sql/40_postalcodes_test.sql | 6 +++--- client/sql/90_permissions_test.sql | 4 ++-- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/client/expected/40_postalcodes_test.out b/client/expected/40_postalcodes_test.out index ec5a808..f179483 100644 --- a/client/expected/40_postalcodes_test.out +++ b/client/expected/40_postalcodes_test.out @@ -6,10 +6,10 @@ BEGIN RETURN NULL; END; $$ LANGUAGE 'plpgsql'; -CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_postalcode_polygon(user_id name, tx_id bigint, postal_code integer, country_name text) +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_polygon invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; + RAISE NOTICE 'cbd_geocoder_server.geocode_postalcode_point invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; RETURN NULL; END; $$ LANGUAGE 'plpgsql'; @@ -23,12 +23,12 @@ PL/pgSQL function cdb_geocoder_client.geocode_postalcode_polygon(text,text) line (1 row) -SELECT cdb_geocoder_client.geocode_postalcode_polygon(3204, '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, 3204, 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(integer,text) line 5 at SQL statement - geocode_postalcode_polygon ----------------------------- +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) +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 +-------------------------- (1 row) diff --git a/client/expected/90_permissions_test.out b/client/expected/90_permissions_test.out index 63c0a9d..1341c35 100644 --- a/client/expected/90_permissions_test.out +++ b/client/expected/90_permissions_test.out @@ -65,12 +65,12 @@ PL/pgSQL function cdb_geocoder_client.geocode_postalcode_polygon(text,text) line (1 row) -SELECT cdb_geocoder_client.geocode_postalcode_polygon(3204, '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, 3204, 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(integer,text) line 5 at SQL statement - geocode_postalcode_polygon ----------------------------- +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) +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 +-------------------------- (1 row) @@ -98,8 +98,8 @@ SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol', ERROR: permission denied for function _geocode_namedplace_point SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, '66666', 'Hell'); ERROR: permission denied for function _geocode_postalcode_polygon -SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, 66666, 'Hell'); -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 -- Check the regular user cannot look into config table diff --git a/client/sql/0.0.1/40_postalcodes.sql b/client/sql/0.0.1/40_postalcodes.sql index 26b404b..f3afcc8 100644 --- a/client/sql/0.0.1/40_postalcodes.sql +++ b/client/sql/0.0.1/40_postalcodes.sql @@ -16,12 +16,12 @@ END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER; ---- geocode_postalcode_polygon(postal_code integer, country_name text) -CREATE OR REPLACE FUNCTION cdb_geocoder_client.geocode_postalcode_polygon(postal_code integer, country_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client.geocode_postalcode_point(postal_code text, country_name text) RETURNS Geometry AS $$ DECLARE ret Geometry; BEGIN - SELECT cdb_geocoder_client._geocode_postalcode_polygon(session_user, txid_current(), postal_code, country_name) INTO ret; + SELECT cdb_geocoder_client._geocode_postalcode_point(session_user, txid_current(), postal_code, country_name) INTO ret; RETURN ret; END; $$ LANGUAGE 'plpgsql' SECURITY DEFINER; @@ -37,8 +37,8 @@ RETURNS Geometry AS $$ SELECT cdb_geocoder_server.geocode_postalcode_polygon(user_id, tx_id, postal_code, country_name); $$ LANGUAGE plproxy; ----- geocode_postalcode_polygon(postal_code integer, country_name text) -CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_postalcode_polygon(user_id name, tx_id bigint, postal_code integer, country_name text) +---- geocode_postalcode_polygon(postal_code text, country_name text) +CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_postalcode_point(user_id name, tx_id bigint, postal_code text, country_name text) RETURNS Geometry AS $$ CONNECT cdb_geocoder_client._server_conn_str(); SELECT cdb_geocoder_server.geocode_postalcode_polygon(user_id, tx_id, postal_code, country_name); diff --git a/client/sql/0.0.1/90_permissions.sql b/client/sql/0.0.1/90_permissions.sql index 314df3f..ec1c0aa 100644 --- a/client/sql/0.0.1/90_permissions.sql +++ b/client/sql/0.0.1/90_permissions.sql @@ -19,5 +19,5 @@ 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, country_name text) TO publicuser; 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_polygon(postal_code integer, 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; diff --git a/client/sql/40_postalcodes_test.sql b/client/sql/40_postalcodes_test.sql index a402397..8181808 100644 --- a/client/sql/40_postalcodes_test.sql +++ b/client/sql/40_postalcodes_test.sql @@ -7,14 +7,14 @@ BEGIN END; $$ LANGUAGE 'plpgsql'; -CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_postalcode_polygon(user_id name, tx_id bigint, postal_code integer, country_name text) +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_polygon invoked with params (%, %, %, %)', user_id, 'some_transaction_id', postal_code, country_name; + RAISE NOTICE 'cbd_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'); -SELECT cdb_geocoder_client.geocode_postalcode_polygon(3204, 'Spain'); +SELECT cdb_geocoder_client.geocode_postalcode_point('03204', 'Spain'); diff --git a/client/sql/90_permissions_test.sql b/client/sql/90_permissions_test.sql index 2385762..1a1638b 100644 --- a/client/sql/90_permissions_test.sql +++ b/client/sql/90_permissions_test.sql @@ -10,7 +10,7 @@ SELECT cdb_geocoder_client.geocode_namedplace_point('Elx'); 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_polygon(3204, 'Spain'); +SELECT cdb_geocoder_client.geocode_postalcode_point('03204', 'Spain'); SELECT cdb_geocoder_client.geocode_ip('8.8.8.8'); -- Check the regular user has no permissions on private functions @@ -21,7 +21,7 @@ SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol'); SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol', 'Hell'); 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_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'); -- Check the regular user cannot look into config table