diff --git a/client/.gitignore b/client/.gitignore index dece5cc..dff332e 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -7,3 +7,4 @@ regression.out cdb_geocoder_client--0.0.1.sql cdb_geocoder_client--0.1.0.sql cdb_geocoder_client--0.2.0.sql +cdb_geocoder_client--0.3.0.sql \ No newline at end of file diff --git a/client/Makefile b/client/Makefile index 074cd73..409c101 100644 --- a/client/Makefile +++ b/client/Makefile @@ -17,8 +17,8 @@ DATA = $(NEW_EXTENSION_ARTIFACT) \ cdb_dataservices_client--0.3.0--0.2.0.sql -REGRESS = $(notdir $(basename $(wildcard test/$(EXTVERSION)/sql/*test.sql))) -TEST_DIR = test/$(EXTVERSION) +REGRESS = $(notdir $(basename $(wildcard test/sql/*test.sql))) +TEST_DIR = test/ REGRESS_OPTS = --inputdir='$(TEST_DIR)' --outputdir='$(TEST_DIR)' # postgres build stuff @@ -26,11 +26,11 @@ PG_CONFIG = pg_config PGXS := $(shell $(PG_CONFIG) --pgxs) include $(PGXS) -SOURCES_DATA_DIR = sql/$(EXTVERSION) +SOURCES_DATA_DIR = sql/ # The interface definition is used along with some templates to automatically generate code RENDERER = renderer/sql-template-renderer -INTERFACE_FILE = renderer/interfaces/interface_$(EXTVERSION).yaml +INTERFACE_FILE = renderer/interface.yaml TEMPLATE_DIR = renderer/templates TEMPLATE_FILES = $(wildcard $(TEMPLATE_DIR)/*.erb) GENERATED_SQL_FILES = $(patsubst $(TEMPLATE_DIR)/%.erb, $(SOURCES_DATA_DIR)/%.sql, $(TEMPLATE_FILES)) diff --git a/client/renderer/interfaces/interface_0.3.0.yaml b/client/renderer/interface.yaml similarity index 100% rename from client/renderer/interfaces/interface_0.3.0.yaml rename to client/renderer/interface.yaml diff --git a/client/renderer/interfaces/interface_0.0.1.yaml b/client/renderer/interfaces/interface_0.0.1.yaml deleted file mode 100644 index 9f219fb..0000000 --- a/client/renderer/interfaces/interface_0.0.1.yaml +++ /dev/null @@ -1,52 +0,0 @@ ---- -- name: cdb_geocode_admin0_polygon - return_type: Geometry - params: - - { name: country_name, type: text } - -- name: cdb_geocode_admin1_polygon - return_type: Geometry - params: - - { name: admin1_name, type: text } - -- name: cdb_geocode_admin1_polygon - return_type: Geometry - params: - - { name: admin1_name, type: text } - - { name: country_name, type: text } - -- name: cdb_geocode_namedplace_point - return_type: Geometry - params: - - { name: city_name, type: text} - -- name: cdb_geocode_namedplace_point - return_type: Geometry - params: - - { name: city_name, type: text} - - { name: country_name, type: text} - -- name: cdb_geocode_namedplace_point - return_type: Geometry - params: - - { name: city_name, type: text} - - { name: admin1_name, type: text} - - { name: country_name, type: text} - - -- name: cdb_geocode_postalcode_polygon - return_type: Geometry - params: - - { name: postal_code, type: text} - - { name: country_name, type: text} - -- name: cdb_geocode_postalcode_point - return_type: Geometry - params: - - { name: postal_code, type: text} - - { name: country_name, type: text} - -- name: cdb_geocode_ipaddress_point - return_type: Geometry - params: - - { name: ip_address, type: text} \ No newline at end of file diff --git a/client/renderer/interfaces/interface_0.1.0.yaml b/client/renderer/interfaces/interface_0.1.0.yaml deleted file mode 100644 index e64c504..0000000 --- a/client/renderer/interfaces/interface_0.1.0.yaml +++ /dev/null @@ -1,60 +0,0 @@ ---- -- name: cdb_geocode_admin0_polygon - return_type: Geometry - params: - - { name: country_name, type: text } - -- name: cdb_geocode_admin1_polygon - return_type: Geometry - params: - - { name: admin1_name, type: text } - -- name: cdb_geocode_admin1_polygon - return_type: Geometry - params: - - { name: admin1_name, type: text } - - { name: country_name, type: text } - -- name: cdb_geocode_namedplace_point - return_type: Geometry - params: - - { name: city_name, type: text} - -- name: cdb_geocode_namedplace_point - return_type: Geometry - params: - - { name: city_name, type: text} - - { name: country_name, type: text} - -- name: cdb_geocode_namedplace_point - return_type: Geometry - params: - - { name: city_name, type: text} - - { name: admin1_name, type: text} - - { name: country_name, type: text} - - -- name: cdb_geocode_postalcode_polygon - return_type: Geometry - params: - - { name: postal_code, type: text} - - { name: country_name, type: text} - -- name: cdb_geocode_postalcode_point - return_type: Geometry - params: - - { name: postal_code, type: text} - - { name: country_name, type: text} - -- name: cdb_geocode_ipaddress_point - return_type: Geometry - params: - - { name: ip_address, type: text} - -- name: cdb_geocode_street_point - return_type: Geometry - params: - - { name: searchtext, type: text} - - { name: city, type: text, default: 'NULL'} - - { name: state_province, type: text, default: 'NULL'} - - { name: country, type: text, default: 'NULL'} diff --git a/client/renderer/interfaces/interface_0.2.0.yaml b/client/renderer/interfaces/interface_0.2.0.yaml deleted file mode 100644 index 71fe731..0000000 --- a/client/renderer/interfaces/interface_0.2.0.yaml +++ /dev/null @@ -1,79 +0,0 @@ ---- -- name: cdb_geocode_admin0_polygon - return_type: Geometry - params: - - { name: country_name, type: text } - -- name: cdb_geocode_admin1_polygon - return_type: Geometry - params: - - { name: admin1_name, type: text } - -- name: cdb_geocode_admin1_polygon - return_type: Geometry - params: - - { name: admin1_name, type: text } - - { name: country_name, type: text } - -- name: cdb_geocode_namedplace_point - return_type: Geometry - params: - - { name: city_name, type: text} - -- name: cdb_geocode_namedplace_point - return_type: Geometry - params: - - { name: city_name, type: text} - - { name: country_name, type: text} - -- name: cdb_geocode_namedplace_point - return_type: Geometry - params: - - { name: city_name, type: text} - - { name: admin1_name, type: text} - - { name: country_name, type: text} - - -- name: cdb_geocode_postalcode_polygon - return_type: Geometry - params: - - { name: postal_code, type: text} - - { name: country_name, type: text} - -- name: cdb_geocode_postalcode_point - return_type: Geometry - params: - - { name: postal_code, type: text} - - { name: country_name, type: text} - -- name: cdb_geocode_ipaddress_point - return_type: Geometry - params: - - { name: ip_address, type: text} - -- name: cdb_geocode_street_point - return_type: Geometry - params: - - { name: searchtext, type: text} - - { name: city, type: text, default: 'NULL'} - - { name: state_province, type: text, default: 'NULL'} - - { name: country, type: text, default: 'NULL'} - -- name: cdb_isodistance - return_type: SETOF cdb_dataservices_client.isoline - multi_row: true - params: - - { name: source, type: "geometry(Geometry, 4326)" } - - { name: mode, type: text } - - { name: range, type: "integer[]" } - - { name: options, type: "text[]", default: 'ARRAY[]::text[]' } - -- name: cdb_isochrone - return_type: SETOF cdb_dataservices_client.isoline - multi_row: true - params: - - { name: source, type: "geometry(Geometry, 4326)" } - - { name: mode, type: text } - - { name: range, type: "integer[]" } - - { name: options, type: "text[]", default: 'ARRAY[]::text[]' } - diff --git a/client/sql/0.0.1/10_geocoder_server_conn.sql b/client/sql/0.0.1/10_geocoder_server_conn.sql deleted file mode 100644 index 89cbcbd..0000000 --- a/client/sql/0.0.1/10_geocoder_server_conn.sql +++ /dev/null @@ -1,16 +0,0 @@ --- --- Geocoder server connection config --- --- The purpose of this function is provide to the PL/Proxy functions --- the connection string needed to connect with the server - -CREATE OR REPLACE FUNCTION cdb_dataservices_client._server_conn_str() -RETURNS text AS $$ -DECLARE - db_connection_str text; -BEGIN - SELECT cartodb.cdb_conf_getconf('geocoder_server_config')->'connection_str' INTO db_connection_str; - SELECT trim(both '"' FROM db_connection_str) INTO db_connection_str; - RETURN db_connection_str; -END; -$$ LANGUAGE 'plpgsql'; diff --git a/client/sql/0.0.1/15_config_management.sql b/client/sql/0.0.1/15_config_management.sql deleted file mode 100644 index 4d4187b..0000000 --- a/client/sql/0.0.1/15_config_management.sql +++ /dev/null @@ -1,37 +0,0 @@ -CREATE TYPE cdb_dataservices_client._entity_config AS ( - username text, - organization_name text -); - --- --- Get entity config function --- --- The purpose of this function is to retrieve the username and organization name from --- a) schema where he/her is the owner in case is an organization user --- b) entity_name from the cdb_conf database in case is a non organization user -CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_entity_config() -RETURNS record AS $$ -DECLARE - result cdb_dataservices_client._entity_config; - is_organization boolean; - username text; - organization_name text; -BEGIN - SELECT cartodb.cdb_conf_getconf('user_config')->'is_organization' INTO is_organization; - IF is_organization IS NULL THEN - RAISE EXCEPTION 'User must have user configuration in the config table'; - ELSIF is_organization = TRUE THEN - SELECT nspname - FROM pg_namespace s - LEFT JOIN pg_roles r ON s.nspowner = r.oid - WHERE r.rolname = session_user INTO username; - SELECT cartodb.cdb_conf_getconf('user_config')->'entity_name' INTO organization_name; - ELSE - SELECT cartodb.cdb_conf_getconf('user_config')->'entity_name' INTO username; - organization_name = NULL; - END IF; - result.username = username; - result.organization_name = organization_name; - RETURN result; -END; -$$ LANGUAGE 'plpgsql' SECURITY DEFINER; diff --git a/client/sql/0.1.0/00_header.sql b/client/sql/0.1.0/00_header.sql deleted file mode 100644 index 65eb4bf..0000000 --- a/client/sql/0.1.0/00_header.sql +++ /dev/null @@ -1,3 +0,0 @@ ---DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES --- Complain if script is sourced in psql, rather than via CREATE EXTENSION -\echo Use "CREATE EXTENSION cdb_dataservices_client" to load this file. \quit diff --git a/client/sql/0.1.0/10_geocoder_server_conn.sql b/client/sql/0.1.0/10_geocoder_server_conn.sql deleted file mode 100644 index 89cbcbd..0000000 --- a/client/sql/0.1.0/10_geocoder_server_conn.sql +++ /dev/null @@ -1,16 +0,0 @@ --- --- Geocoder server connection config --- --- The purpose of this function is provide to the PL/Proxy functions --- the connection string needed to connect with the server - -CREATE OR REPLACE FUNCTION cdb_dataservices_client._server_conn_str() -RETURNS text AS $$ -DECLARE - db_connection_str text; -BEGIN - SELECT cartodb.cdb_conf_getconf('geocoder_server_config')->'connection_str' INTO db_connection_str; - SELECT trim(both '"' FROM db_connection_str) INTO db_connection_str; - RETURN db_connection_str; -END; -$$ LANGUAGE 'plpgsql'; diff --git a/client/sql/0.1.0/15_config_management.sql b/client/sql/0.1.0/15_config_management.sql deleted file mode 100644 index 7680cfd..0000000 --- a/client/sql/0.1.0/15_config_management.sql +++ /dev/null @@ -1,37 +0,0 @@ -CREATE TYPE cdb_dataservices_client._entity_config AS ( - username text, - organization_name text -); - --- --- Get entity config function --- --- The purpose of this function is to retrieve the username and organization name from --- a) schema where he/her is the owner in case is an organization user --- b) entity_name from the cdb_conf database in case is a non organization user -CREATE OR REPLACE FUNCTION cdb_dataservices_client._cdb_entity_config() -RETURNS record AS $$ -DECLARE - result cdb_dataservices_client._entity_config; - is_organization boolean; - username text; - organization_name text; -BEGIN - SELECT cartodb.cdb_conf_getconf('user_config')->'is_organization' INTO is_organization; - IF is_organization IS NULL THEN - RAISE EXCEPTION 'User must have user configuration in the config table'; - ELSIF is_organization = TRUE THEN - SELECT nspname - FROM pg_namespace s - LEFT JOIN pg_roles r ON s.nspowner = r.oid - WHERE r.rolname = session_user INTO username; - SELECT cartodb.cdb_conf_getconf('user_config')->>'entity_name' INTO organization_name; - ELSE - SELECT cartodb.cdb_conf_getconf('user_config')->>'entity_name' INTO username; - organization_name = NULL; - END IF; - result.username = username; - result.organization_name = organization_name; - RETURN result; -END; -$$ LANGUAGE 'plpgsql' SECURITY DEFINER; diff --git a/client/sql/0.1.0/80_permissions.sql b/client/sql/0.1.0/80_permissions.sql deleted file mode 100644 index 4af1393..0000000 --- a/client/sql/0.1.0/80_permissions.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Make sure by default there are no permissions for publicuser --- NOTE: this happens at extension creation time, as part of an implicit transaction. -REVOKE ALL PRIVILEGES ON SCHEMA cdb_dataservices_client FROM PUBLIC, publicuser CASCADE; - --- Grant permissions on the schema to publicuser (but just the schema) -GRANT USAGE ON SCHEMA cdb_dataservices_client TO publicuser; - --- Revoke execute permissions on all functions in the schema by default -REVOKE EXECUTE ON ALL FUNCTIONS IN SCHEMA cdb_dataservices_client FROM PUBLIC, publicuser; diff --git a/client/sql/0.2.0/00_header.sql b/client/sql/0.2.0/00_header.sql deleted file mode 100644 index 65eb4bf..0000000 --- a/client/sql/0.2.0/00_header.sql +++ /dev/null @@ -1,3 +0,0 @@ ---DO NOT MODIFY THIS FILE, IT IS GENERATED AUTOMATICALLY FROM SOURCES --- Complain if script is sourced in psql, rather than via CREATE EXTENSION -\echo Use "CREATE EXTENSION cdb_dataservices_client" to load this file. \quit diff --git a/client/sql/0.2.0/16_custom_types.sql b/client/sql/0.2.0/16_custom_types.sql deleted file mode 100644 index 5b37dde..0000000 --- a/client/sql/0.2.0/16_custom_types.sql +++ /dev/null @@ -1,5 +0,0 @@ -CREATE TYPE cdb_dataservices_client.isoline AS ( - center geometry(Geometry,4326), - data_range integer, - the_geom geometry(Multipolygon,4326) -); \ No newline at end of file diff --git a/client/sql/0.2.0/80_permissions.sql b/client/sql/0.2.0/80_permissions.sql deleted file mode 100644 index 4af1393..0000000 --- a/client/sql/0.2.0/80_permissions.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Make sure by default there are no permissions for publicuser --- NOTE: this happens at extension creation time, as part of an implicit transaction. -REVOKE ALL PRIVILEGES ON SCHEMA cdb_dataservices_client FROM PUBLIC, publicuser CASCADE; - --- Grant permissions on the schema to publicuser (but just the schema) -GRANT USAGE ON SCHEMA cdb_dataservices_client TO publicuser; - --- Revoke execute permissions on all functions in the schema by default -REVOKE EXECUTE ON ALL FUNCTIONS IN SCHEMA cdb_dataservices_client FROM PUBLIC, publicuser; diff --git a/client/sql/0.3.0/00_header.sql b/client/sql/0.3.0/00_header.sql deleted file mode 120000 index 2277a52..0000000 --- a/client/sql/0.3.0/00_header.sql +++ /dev/null @@ -1 +0,0 @@ -../0.2.0/00_header.sql \ No newline at end of file diff --git a/client/sql/0.3.0/10_geocoder_server_conn.sql b/client/sql/0.3.0/10_geocoder_server_conn.sql deleted file mode 120000 index dcd6ff0..0000000 --- a/client/sql/0.3.0/10_geocoder_server_conn.sql +++ /dev/null @@ -1 +0,0 @@ -../0.2.0/10_geocoder_server_conn.sql \ No newline at end of file diff --git a/client/sql/0.3.0/15_config_management.sql b/client/sql/0.3.0/15_config_management.sql deleted file mode 120000 index c517070..0000000 --- a/client/sql/0.3.0/15_config_management.sql +++ /dev/null @@ -1 +0,0 @@ -../0.2.0/15_config_management.sql \ No newline at end of file diff --git a/client/sql/0.3.0/80_permissions.sql b/client/sql/0.3.0/80_permissions.sql deleted file mode 120000 index 359eb6a..0000000 --- a/client/sql/0.3.0/80_permissions.sql +++ /dev/null @@ -1 +0,0 @@ -../0.2.0/80_permissions.sql \ No newline at end of file diff --git a/client/sql/0.0.1/00_header.sql b/client/sql/00_header.sql similarity index 100% rename from client/sql/0.0.1/00_header.sql rename to client/sql/00_header.sql diff --git a/client/sql/0.2.0/10_geocoder_server_conn.sql b/client/sql/10_geocoder_server_conn.sql similarity index 95% rename from client/sql/0.2.0/10_geocoder_server_conn.sql rename to client/sql/10_geocoder_server_conn.sql index 89cbcbd..d180ab6 100644 --- a/client/sql/0.2.0/10_geocoder_server_conn.sql +++ b/client/sql/10_geocoder_server_conn.sql @@ -13,4 +13,4 @@ BEGIN SELECT trim(both '"' FROM db_connection_str) INTO db_connection_str; RETURN db_connection_str; END; -$$ LANGUAGE 'plpgsql'; +$$ LANGUAGE 'plpgsql'; \ No newline at end of file diff --git a/client/sql/0.2.0/15_config_management.sql b/client/sql/15_config_management.sql similarity index 97% rename from client/sql/0.2.0/15_config_management.sql rename to client/sql/15_config_management.sql index 7680cfd..6a27cf6 100644 --- a/client/sql/0.2.0/15_config_management.sql +++ b/client/sql/15_config_management.sql @@ -34,4 +34,4 @@ BEGIN result.organization_name = organization_name; RETURN result; END; -$$ LANGUAGE 'plpgsql' SECURITY DEFINER; +$$ LANGUAGE 'plpgsql' SECURITY DEFINER; \ No newline at end of file diff --git a/client/sql/0.3.0/16_custom_types.sql b/client/sql/16_custom_types.sql similarity index 100% rename from client/sql/0.3.0/16_custom_types.sql rename to client/sql/16_custom_types.sql diff --git a/client/sql/0.0.1/80_permissions.sql b/client/sql/80_permissions.sql similarity index 94% rename from client/sql/0.0.1/80_permissions.sql rename to client/sql/80_permissions.sql index 4af1393..0020ad0 100644 --- a/client/sql/0.0.1/80_permissions.sql +++ b/client/sql/80_permissions.sql @@ -6,4 +6,4 @@ REVOKE ALL PRIVILEGES ON SCHEMA cdb_dataservices_client FROM PUBLIC, publicuser GRANT USAGE ON SCHEMA cdb_dataservices_client TO publicuser; -- Revoke execute permissions on all functions in the schema by default -REVOKE EXECUTE ON ALL FUNCTIONS IN SCHEMA cdb_dataservices_client FROM PUBLIC, publicuser; +REVOKE EXECUTE ON ALL FUNCTIONS IN SCHEMA cdb_dataservices_client FROM PUBLIC, publicuser; \ No newline at end of file diff --git a/client/test/0.0.1/expected/10_admin0_test.out b/client/test/0.0.1/expected/10_admin0_test.out deleted file mode 100644 index 178584c..0000000 --- a/client/test/0.0.1/expected/10_admin0_test.out +++ /dev/null @@ -1,20 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; --- Mock the server function -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_admin0_polygon(username text, orgname text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_admin0_polygon invoked with params (%, %, %)', username, orgname, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; --- Exercise the public and the proxied function -SELECT cdb_geocode_admin0_polygon('Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_admin0_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_admin0_polygon invoked with params ("test_user", , Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_admin0_polygon(username, orgname, country_name)" -PL/pgSQL function cdb_geocode_admin0_polygon(text) line 15 at SQL statement - cdb_geocode_admin0_polygon ----------------------------- - -(1 row) - diff --git a/client/test/0.0.1/expected/20_admin1_test.out b/client/test/0.0.1/expected/20_admin1_test.out deleted file mode 100644 index 647643b..0000000 --- a/client/test/0.0.1/expected/20_admin1_test.out +++ /dev/null @@ -1,36 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_admin1_polygon(username text, orgname text, admin1_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params (%, %, %)', username, orgname, admin1_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_admin1_polygon(username text, orgname text, admin1_name text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params (%, %, %, %)', username, orgname, admin1_name, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; --- Exercise the public and the proxied function -SELECT cdb_geocode_admin1_polygon('California'); -NOTICE: cdb_dataservices_client._cdb_geocode_admin1_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params ("test_user", , California) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_admin1_polygon(username, orgname, admin1_name)" -PL/pgSQL function cdb_geocode_admin1_polygon(text) line 15 at SQL statement - cdb_geocode_admin1_polygon ----------------------------- - -(1 row) - -SELECT cdb_geocode_admin1_polygon('California', 'United States'); -NOTICE: cdb_dataservices_client._cdb_geocode_admin1_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params ("test_user", , California, United States) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_admin1_polygon(username, orgname, admin1_name, country_name)" -PL/pgSQL function cdb_geocode_admin1_polygon(text,text) line 15 at SQL statement - cdb_geocode_admin1_polygon ----------------------------- - -(1 row) - diff --git a/client/test/0.0.1/expected/30_namedplaces_test.out b/client/test/0.0.1/expected/30_namedplaces_test.out deleted file mode 100644 index b04faf2..0000000 --- a/client/test/0.0.1/expected/30_namedplaces_test.out +++ /dev/null @@ -1,52 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (%, %, %)', username, orgname, city_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %)', username, orgname, city_name, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text, admin1_name text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %, %)', username, orgname, city_name, admin1_name, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; --- Exercise the public and the proxied function -SELECT cdb_geocode_namedplace_point('Elx'); -NOTICE: cdb_dataservices_client._cdb_geocode_namedplace_point(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params ("test_user", , Elx) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_namedplace_point(username, orgname, city_name)" -PL/pgSQL function cdb_geocode_namedplace_point(text) line 15 at SQL statement - cdb_geocode_namedplace_point ------------------------------- - -(1 row) - -SELECT cdb_geocode_namedplace_point('Elx', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params ("test_user", , Elx, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_namedplace_point(username, orgname, city_name, country_name)" -PL/pgSQL function cdb_geocode_namedplace_point(text,text) line 15 at SQL statement - cdb_geocode_namedplace_point ------------------------------- - -(1 row) - -SELECT cdb_geocode_namedplace_point('Elx', 'Valencia', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_namedplace_point(5): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params ("test_user", , Elx, Valencia, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_namedplace_point(username, orgname, city_name, admin1_name, country_name)" -PL/pgSQL function cdb_geocode_namedplace_point(text,text,text) line 15 at SQL statement - cdb_geocode_namedplace_point ------------------------------- - -(1 row) - diff --git a/client/test/0.0.1/expected/40_postalcodes_test.out b/client/test/0.0.1/expected/40_postalcodes_test.out deleted file mode 100644 index a5a1d73..0000000 --- a/client/test/0.0.1/expected/40_postalcodes_test.out +++ /dev/null @@ -1,36 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_postalcode_polygon(username text, orgname text, postal_code text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_postalcode_polygon invoked with params (%, %, %, %)', username, orgname, postal_code, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_postalcode_point(username text, orgname text, postal_code text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_postalcode_point invoked with params (%, %, %, %)', username, orgname, postal_code, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; --- Exercise the public and the proxied function -SELECT cdb_geocode_postalcode_polygon('03204', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_postalcode_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_postalcode_polygon invoked with params ("test_user", , 03204, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_postalcode_polygon(username, orgname, postal_code, country_name)" -PL/pgSQL function cdb_geocode_postalcode_polygon(text,text) line 15 at SQL statement - cdb_geocode_postalcode_polygon --------------------------------- - -(1 row) - -SELECT cdb_geocode_postalcode_point('03204', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_postalcode_point(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_postalcode_point invoked with params ("test_user", , 03204, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_postalcode_point(username, orgname, postal_code, country_name)" -PL/pgSQL function cdb_geocode_postalcode_point(text,text) line 15 at SQL statement - cdb_geocode_postalcode_point ------------------------------- - -(1 row) - diff --git a/client/test/0.0.1/expected/50_ipaddresses_test.out b/client/test/0.0.1/expected/50_ipaddresses_test.out deleted file mode 100644 index ad8cb8a..0000000 --- a/client/test/0.0.1/expected/50_ipaddresses_test.out +++ /dev/null @@ -1,20 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_ipaddress_point(username text, orgname text, ip_address text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_ipaddress_point invoked with params (%, %, %)', username, orgname, ip_address; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; --- Exercise the public and the proxied function -SELECT cdb_geocode_ipaddress_point('8.8.8.8'); -NOTICE: cdb_dataservices_client._cdb_geocode_ipaddress_point(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_ipaddress_point invoked with params ("test_user", , 8.8.8.8) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_ipaddress_point(username, orgname, ip_address)" -PL/pgSQL function cdb_geocode_ipaddress_point(text) line 15 at SQL statement - cdb_geocode_ipaddress_point ------------------------------ - -(1 row) - diff --git a/client/test/0.0.1/expected/90_permissions_test.out b/client/test/0.0.1/expected/90_permissions_test.out deleted file mode 100644 index 3ed5347..0000000 --- a/client/test/0.0.1/expected/90_permissions_test.out +++ /dev/null @@ -1,106 +0,0 @@ --- Use regular user role -SET ROLE test_regular_user; --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; --- Exercise the public function --- it is public, it shall work -SELECT cdb_geocode_admin0_polygon('Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_admin0_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_admin0_polygon invoked with params ("test_user", , Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_admin0_polygon(username, orgname, country_name)" -PL/pgSQL function cdb_geocode_admin0_polygon(text) line 15 at SQL statement - cdb_geocode_admin0_polygon ----------------------------- - -(1 row) - -SELECT cdb_geocode_admin1_polygon('California'); -NOTICE: cdb_dataservices_client._cdb_geocode_admin1_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params ("test_user", , California) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_admin1_polygon(username, orgname, admin1_name)" -PL/pgSQL function cdb_geocode_admin1_polygon(text) line 15 at SQL statement - cdb_geocode_admin1_polygon ----------------------------- - -(1 row) - -SELECT cdb_geocode_admin1_polygon('California', 'United States'); -NOTICE: cdb_dataservices_client._cdb_geocode_admin1_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params ("test_user", , California, United States) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_admin1_polygon(username, orgname, admin1_name, country_name)" -PL/pgSQL function cdb_geocode_admin1_polygon(text,text) line 15 at SQL statement - cdb_geocode_admin1_polygon ----------------------------- - -(1 row) - -SELECT cdb_geocode_namedplace_point('Elx'); -NOTICE: cdb_dataservices_client._cdb_geocode_namedplace_point(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params ("test_user", , Elx) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_namedplace_point(username, orgname, city_name)" -PL/pgSQL function cdb_geocode_namedplace_point(text) line 15 at SQL statement - cdb_geocode_namedplace_point ------------------------------- - -(1 row) - -SELECT cdb_geocode_namedplace_point('Elx', 'Valencia'); -NOTICE: cdb_dataservices_client._cdb_geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params ("test_user", , Elx, Valencia) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_namedplace_point(username, orgname, city_name, country_name)" -PL/pgSQL function cdb_geocode_namedplace_point(text,text) line 15 at SQL statement - cdb_geocode_namedplace_point ------------------------------- - -(1 row) - -SELECT cdb_geocode_namedplace_point('Elx', 'Valencia', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_namedplace_point(5): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params ("test_user", , Elx, Valencia, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_namedplace_point(username, orgname, city_name, admin1_name, country_name)" -PL/pgSQL function cdb_geocode_namedplace_point(text,text,text) line 15 at SQL statement - cdb_geocode_namedplace_point ------------------------------- - -(1 row) - -SELECT cdb_geocode_postalcode_polygon('03204', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_postalcode_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_postalcode_polygon invoked with params ("test_user", , 03204, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_postalcode_polygon(username, orgname, postal_code, country_name)" -PL/pgSQL function cdb_geocode_postalcode_polygon(text,text) line 15 at SQL statement - cdb_geocode_postalcode_polygon --------------------------------- - -(1 row) - -SELECT cdb_geocode_postalcode_point('03204', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_postalcode_point(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_postalcode_point invoked with params ("test_user", , 03204, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_postalcode_point(username, orgname, postal_code, country_name)" -PL/pgSQL function cdb_geocode_postalcode_point(text,text) line 15 at SQL statement - cdb_geocode_postalcode_point ------------------------------- - -(1 row) - -SELECT cdb_geocode_ipaddress_point('8.8.8.8'); -NOTICE: cdb_dataservices_client._cdb_geocode_ipaddress_point(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_ipaddress_point invoked with params ("test_user", , 8.8.8.8) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_ipaddress_point(username, orgname, ip_address)" -PL/pgSQL function cdb_geocode_ipaddress_point(text) line 15 at SQL statement - cdb_geocode_ipaddress_point ------------------------------ - -(1 row) - --- Check the regular user has no permissions on private functions -SELECT _cdb_geocode_admin0_polygon('evil_user', 'evil_orgname', 'Hell'); -ERROR: permission denied for function _cdb_geocode_admin0_polygon -SELECT _cdb_geocode_admin1_polygon('evil_user', 'evil_orgname', 'Hell'); -ERROR: permission denied for function _cdb_geocode_admin1_polygon -SELECT _cdb_geocode_admin1_polygon('evil_user', 'evil_orgname', 'Sheol', 'Hell'); -ERROR: permission denied for function _cdb_geocode_admin1_polygon -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol'); -ERROR: permission denied for function _cdb_geocode_namedplace_point -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol', 'Hell'); -ERROR: permission denied for function _cdb_geocode_namedplace_point -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol', 'Hell', 'Ugly world'); -ERROR: permission denied for function _cdb_geocode_namedplace_point -SELECT _cdb_geocode_postalcode_polygon('evil_user', 'evil_orgname', '66666', 'Hell'); -ERROR: permission denied for function _cdb_geocode_postalcode_polygon -SELECT _cdb_geocode_postalcode_point('evil_user', 'evil_orgname', '66666', 'Hell'); -ERROR: permission denied for function _cdb_geocode_postalcode_point -SELECT _cdb_geocode_ipaddress_point('evil_user', 'evil_orgname', '8.8.8.8'); -ERROR: permission denied for function _cdb_geocode_ipaddress_point diff --git a/client/test/0.0.1/sql/90_permissions_test.sql b/client/test/0.0.1/sql/90_permissions_test.sql deleted file mode 100644 index 7fbd2a0..0000000 --- a/client/test/0.0.1/sql/90_permissions_test.sql +++ /dev/null @@ -1,28 +0,0 @@ --- Use regular user role -SET ROLE test_regular_user; - --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; - --- Exercise the public function --- it is public, it shall work -SELECT cdb_geocode_admin0_polygon('Spain'); -SELECT cdb_geocode_admin1_polygon('California'); -SELECT cdb_geocode_admin1_polygon('California', 'United States'); -SELECT cdb_geocode_namedplace_point('Elx'); -SELECT cdb_geocode_namedplace_point('Elx', 'Valencia'); -SELECT cdb_geocode_namedplace_point('Elx', 'Valencia', 'Spain'); -SELECT cdb_geocode_postalcode_polygon('03204', 'Spain'); -SELECT cdb_geocode_postalcode_point('03204', 'Spain'); -SELECT cdb_geocode_ipaddress_point('8.8.8.8'); - --- Check the regular user has no permissions on private functions -SELECT _cdb_geocode_admin0_polygon('evil_user', 'evil_orgname', 'Hell'); -SELECT _cdb_geocode_admin1_polygon('evil_user', 'evil_orgname', 'Hell'); -SELECT _cdb_geocode_admin1_polygon('evil_user', 'evil_orgname', 'Sheol', 'Hell'); -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol'); -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol', 'Hell'); -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol', 'Hell', 'Ugly world'); -SELECT _cdb_geocode_postalcode_polygon('evil_user', 'evil_orgname', '66666', 'Hell'); -SELECT _cdb_geocode_postalcode_point('evil_user', 'evil_orgname', '66666', 'Hell'); -SELECT _cdb_geocode_ipaddress_point('evil_user', 'evil_orgname', '8.8.8.8'); diff --git a/client/test/0.1.0/expected/00_installation_test.out b/client/test/0.1.0/expected/00_installation_test.out deleted file mode 100644 index 8c6f98d..0000000 --- a/client/test/0.1.0/expected/00_installation_test.out +++ /dev/null @@ -1,29 +0,0 @@ --- Install dependencies -CREATE EXTENSION postgis; -CREATE EXTENSION schema_triggers; -CREATE EXTENSION plpythonu; -CREATE EXTENSION cartodb; -CREATE EXTENSION plproxy; --- Install the extension -CREATE EXTENSION cdb_dataservices_client; --- Mock the server connection to point to this very test db -SELECT cartodb.cdb_conf_setconf('geocoder_server_config', '{"connection_str": "dbname=contrib_regression host=127.0.0.1 user=postgres"}'); - cdb_conf_setconf ------------------- - -(1 row) - --- Mock the user configuration -SELECT cartodb.cdb_conf_setconf('user_config', '{"is_organization": false, "entity_name": "test_user"}'); - cdb_conf_setconf ------------------- - -(1 row) - --- Mock the server schema -CREATE SCHEMA cdb_dataservices_server; --- Create a test user to check permissions -DROP ROLE IF EXISTS test_regular_user; -CREATE ROLE test_regular_user; -GRANT publicuser TO test_regular_user; -ALTER ROLE test_regular_user SET search_path TO public,cartodb,cdb_dataservices_client; diff --git a/client/test/0.1.0/expected/10_admin0_test.out b/client/test/0.1.0/expected/10_admin0_test.out deleted file mode 100644 index 98fa0db..0000000 --- a/client/test/0.1.0/expected/10_admin0_test.out +++ /dev/null @@ -1,20 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; --- Mock the server function -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_admin0_polygon(username text, orgname text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_admin0_polygon invoked with params (%, %, %)', username, orgname, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; --- Exercise the public and the proxied function -SELECT cdb_geocode_admin0_polygon('Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_admin0_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_admin0_polygon invoked with params (test_user, , Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_admin0_polygon(username, orgname, country_name)" -PL/pgSQL function cdb_geocode_admin0_polygon(text) line 15 at SQL statement - cdb_geocode_admin0_polygon ----------------------------- - -(1 row) - diff --git a/client/test/0.1.0/expected/20_admin1_test.out b/client/test/0.1.0/expected/20_admin1_test.out deleted file mode 100644 index 36486b5..0000000 --- a/client/test/0.1.0/expected/20_admin1_test.out +++ /dev/null @@ -1,36 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_admin1_polygon(username text, orgname text, admin1_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params (%, %, %)', username, orgname, admin1_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_admin1_polygon(username text, orgname text, admin1_name text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params (%, %, %, %)', username, orgname, admin1_name, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; --- Exercise the public and the proxied function -SELECT cdb_geocode_admin1_polygon('California'); -NOTICE: cdb_dataservices_client._cdb_geocode_admin1_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params (test_user, , California) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_admin1_polygon(username, orgname, admin1_name)" -PL/pgSQL function cdb_geocode_admin1_polygon(text) line 15 at SQL statement - cdb_geocode_admin1_polygon ----------------------------- - -(1 row) - -SELECT cdb_geocode_admin1_polygon('California', 'United States'); -NOTICE: cdb_dataservices_client._cdb_geocode_admin1_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params (test_user, , California, United States) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_admin1_polygon(username, orgname, admin1_name, country_name)" -PL/pgSQL function cdb_geocode_admin1_polygon(text,text) line 15 at SQL statement - cdb_geocode_admin1_polygon ----------------------------- - -(1 row) - diff --git a/client/test/0.1.0/expected/30_namedplaces_test.out b/client/test/0.1.0/expected/30_namedplaces_test.out deleted file mode 100644 index c5db519..0000000 --- a/client/test/0.1.0/expected/30_namedplaces_test.out +++ /dev/null @@ -1,52 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (%, %, %)', username, orgname, city_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %)', username, orgname, city_name, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text, admin1_name text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %, %)', username, orgname, city_name, admin1_name, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; --- Exercise the public and the proxied function -SELECT cdb_geocode_namedplace_point('Elx'); -NOTICE: cdb_dataservices_client._cdb_geocode_namedplace_point(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (test_user, , Elx) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_namedplace_point(username, orgname, city_name)" -PL/pgSQL function cdb_geocode_namedplace_point(text) line 15 at SQL statement - cdb_geocode_namedplace_point ------------------------------- - -(1 row) - -SELECT cdb_geocode_namedplace_point('Elx', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (test_user, , Elx, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_namedplace_point(username, orgname, city_name, country_name)" -PL/pgSQL function cdb_geocode_namedplace_point(text,text) line 15 at SQL statement - cdb_geocode_namedplace_point ------------------------------- - -(1 row) - -SELECT cdb_geocode_namedplace_point('Elx', 'Valencia', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_namedplace_point(5): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (test_user, , Elx, Valencia, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_namedplace_point(username, orgname, city_name, admin1_name, country_name)" -PL/pgSQL function cdb_geocode_namedplace_point(text,text,text) line 15 at SQL statement - cdb_geocode_namedplace_point ------------------------------- - -(1 row) - diff --git a/client/test/0.1.0/expected/40_postalcodes_test.out b/client/test/0.1.0/expected/40_postalcodes_test.out deleted file mode 100644 index fae53ec..0000000 --- a/client/test/0.1.0/expected/40_postalcodes_test.out +++ /dev/null @@ -1,36 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_postalcode_polygon(username text, orgname text, postal_code text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_postalcode_polygon invoked with params (%, %, %, %)', username, orgname, postal_code, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_postalcode_point(username text, orgname text, postal_code text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_postalcode_point invoked with params (%, %, %, %)', username, orgname, postal_code, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; --- Exercise the public and the proxied function -SELECT cdb_geocode_postalcode_polygon('03204', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_postalcode_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_postalcode_polygon invoked with params (test_user, , 03204, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_postalcode_polygon(username, orgname, postal_code, country_name)" -PL/pgSQL function cdb_geocode_postalcode_polygon(text,text) line 15 at SQL statement - cdb_geocode_postalcode_polygon --------------------------------- - -(1 row) - -SELECT cdb_geocode_postalcode_point('03204', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_postalcode_point(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_postalcode_point invoked with params (test_user, , 03204, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_postalcode_point(username, orgname, postal_code, country_name)" -PL/pgSQL function cdb_geocode_postalcode_point(text,text) line 15 at SQL statement - cdb_geocode_postalcode_point ------------------------------- - -(1 row) - diff --git a/client/test/0.1.0/expected/50_ipaddresses_test.out b/client/test/0.1.0/expected/50_ipaddresses_test.out deleted file mode 100644 index 18a18db..0000000 --- a/client/test/0.1.0/expected/50_ipaddresses_test.out +++ /dev/null @@ -1,20 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_ipaddress_point(username text, orgname text, ip_address text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_ipaddress_point invoked with params (%, %, %)', username, orgname, ip_address; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; --- Exercise the public and the proxied function -SELECT cdb_geocode_ipaddress_point('8.8.8.8'); -NOTICE: cdb_dataservices_client._cdb_geocode_ipaddress_point(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_ipaddress_point invoked with params (test_user, , 8.8.8.8) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_ipaddress_point(username, orgname, ip_address)" -PL/pgSQL function cdb_geocode_ipaddress_point(text) line 15 at SQL statement - cdb_geocode_ipaddress_point ------------------------------ - -(1 row) - diff --git a/client/test/0.1.0/expected/60_street_test.out b/client/test/0.1.0/expected/60_street_test.out deleted file mode 100644 index 72a11f4..0000000 --- a/client/test/0.1.0/expected/60_street_test.out +++ /dev/null @@ -1,101 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_street_point (username text, orgname text, searchtext text, city text DEFAULT NULL, state_province text DEFAULT NULL, country text DEFAULT NULL) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_geocoder_street_point invoked with params (%, %, %, %, %, %)', username, orgname, searchtext, city, state_province, country; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; --- Exercise the public and the proxied function -SELECT cdb_geocode_street_point('One street, 1'); -NOTICE: cdb_dataservices_client._cdb_geocode_street_point(6): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_geocoder_street_point invoked with params (test_user, , One street, 1, , , ) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_street_point(username, orgname, searchtext, city, state_province, country)" -PL/pgSQL function cdb_geocode_street_point(text,text,text,text) line 15 at SQL statement - cdb_geocode_street_point --------------------------- - -(1 row) - -SELECT cdb_geocode_street_point('One street', 'city'); -NOTICE: cdb_dataservices_client._cdb_geocode_street_point(6): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_geocoder_street_point invoked with params (test_user, , One street, city, , ) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_street_point(username, orgname, searchtext, city, state_province, country)" -PL/pgSQL function cdb_geocode_street_point(text,text,text,text) line 15 at SQL statement - cdb_geocode_street_point --------------------------- - -(1 row) - -SELECT cdb_geocode_street_point('One street', 'city', 'state'); -NOTICE: cdb_dataservices_client._cdb_geocode_street_point(6): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_geocoder_street_point invoked with params (test_user, , One street, city, state, ) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_street_point(username, orgname, searchtext, city, state_province, country)" -PL/pgSQL function cdb_geocode_street_point(text,text,text,text) line 15 at SQL statement - cdb_geocode_street_point --------------------------- - -(1 row) - -SELECT cdb_geocode_street_point('One street', 'city', 'state', 'country'); -NOTICE: cdb_dataservices_client._cdb_geocode_street_point(6): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_geocoder_street_point invoked with params (test_user, , One street, city, state, country) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_street_point(username, orgname, searchtext, city, state_province, country)" -PL/pgSQL function cdb_geocode_street_point(text,text,text,text) line 15 at SQL statement - cdb_geocode_street_point --------------------------- - -(1 row) - -SELECT cdb_geocode_street_point('One street', 'city', NULL, 'country'); -NOTICE: cdb_dataservices_client._cdb_geocode_street_point(6): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_geocoder_street_point invoked with params (test_user, , One street, city, , country) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_street_point(username, orgname, searchtext, city, state_province, country)" -PL/pgSQL function cdb_geocode_street_point(text,text,text,text) line 15 at SQL statement - cdb_geocode_street_point --------------------------- - -(1 row) - -SELECT cdb_geocode_street_point('One street, 1'); -NOTICE: cdb_dataservices_client._cdb_geocode_street_point(6): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_geocoder_street_point invoked with params (test_user, , One street, 1, , , ) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_street_point(username, orgname, searchtext, city, state_province, country)" -PL/pgSQL function cdb_geocode_street_point(text,text,text,text) line 15 at SQL statement - cdb_geocode_street_point --------------------------- - -(1 row) - -SELECT cdb_geocode_street_point('One street', 'city'); -NOTICE: cdb_dataservices_client._cdb_geocode_street_point(6): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_geocoder_street_point invoked with params (test_user, , One street, city, , ) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_street_point(username, orgname, searchtext, city, state_province, country)" -PL/pgSQL function cdb_geocode_street_point(text,text,text,text) line 15 at SQL statement - cdb_geocode_street_point --------------------------- - -(1 row) - -SELECT cdb_geocode_street_point('One street', 'city', 'state'); -NOTICE: cdb_dataservices_client._cdb_geocode_street_point(6): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_geocoder_street_point invoked with params (test_user, , One street, city, state, ) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_street_point(username, orgname, searchtext, city, state_province, country)" -PL/pgSQL function cdb_geocode_street_point(text,text,text,text) line 15 at SQL statement - cdb_geocode_street_point --------------------------- - -(1 row) - -SELECT cdb_geocode_street_point('One street', 'city', 'state', 'country'); -NOTICE: cdb_dataservices_client._cdb_geocode_street_point(6): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_geocoder_street_point invoked with params (test_user, , One street, city, state, country) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_street_point(username, orgname, searchtext, city, state_province, country)" -PL/pgSQL function cdb_geocode_street_point(text,text,text,text) line 15 at SQL statement - cdb_geocode_street_point --------------------------- - -(1 row) - -SELECT cdb_geocode_street_point('One street', 'city', NULL, 'country'); -NOTICE: cdb_dataservices_client._cdb_geocode_street_point(6): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_geocoder_street_point invoked with params (test_user, , One street, city, , country) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_street_point(username, orgname, searchtext, city, state_province, country)" -PL/pgSQL function cdb_geocode_street_point(text,text,text,text) line 15 at SQL statement - cdb_geocode_street_point --------------------------- - -(1 row) - diff --git a/client/test/0.1.0/expected/90_permissions_test.out b/client/test/0.1.0/expected/90_permissions_test.out deleted file mode 100644 index cea19cc..0000000 --- a/client/test/0.1.0/expected/90_permissions_test.out +++ /dev/null @@ -1,117 +0,0 @@ --- Use regular user role -SET ROLE test_regular_user; --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; --- Exercise the public function --- it is public, it shall work -SELECT cdb_geocode_admin0_polygon('Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_admin0_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_admin0_polygon invoked with params (test_user, , Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_admin0_polygon(username, orgname, country_name)" -PL/pgSQL function cdb_geocode_admin0_polygon(text) line 15 at SQL statement - cdb_geocode_admin0_polygon ----------------------------- - -(1 row) - -SELECT cdb_geocode_admin1_polygon('California'); -NOTICE: cdb_dataservices_client._cdb_geocode_admin1_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params (test_user, , California) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_admin1_polygon(username, orgname, admin1_name)" -PL/pgSQL function cdb_geocode_admin1_polygon(text) line 15 at SQL statement - cdb_geocode_admin1_polygon ----------------------------- - -(1 row) - -SELECT cdb_geocode_admin1_polygon('California', 'United States'); -NOTICE: cdb_dataservices_client._cdb_geocode_admin1_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params (test_user, , California, United States) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_admin1_polygon(username, orgname, admin1_name, country_name)" -PL/pgSQL function cdb_geocode_admin1_polygon(text,text) line 15 at SQL statement - cdb_geocode_admin1_polygon ----------------------------- - -(1 row) - -SELECT cdb_geocode_namedplace_point('Elx'); -NOTICE: cdb_dataservices_client._cdb_geocode_namedplace_point(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (test_user, , Elx) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_namedplace_point(username, orgname, city_name)" -PL/pgSQL function cdb_geocode_namedplace_point(text) line 15 at SQL statement - cdb_geocode_namedplace_point ------------------------------- - -(1 row) - -SELECT cdb_geocode_namedplace_point('Elx', 'Valencia'); -NOTICE: cdb_dataservices_client._cdb_geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (test_user, , Elx, Valencia) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_namedplace_point(username, orgname, city_name, country_name)" -PL/pgSQL function cdb_geocode_namedplace_point(text,text) line 15 at SQL statement - cdb_geocode_namedplace_point ------------------------------- - -(1 row) - -SELECT cdb_geocode_namedplace_point('Elx', 'Valencia', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_namedplace_point(5): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (test_user, , Elx, Valencia, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_namedplace_point(username, orgname, city_name, admin1_name, country_name)" -PL/pgSQL function cdb_geocode_namedplace_point(text,text,text) line 15 at SQL statement - cdb_geocode_namedplace_point ------------------------------- - -(1 row) - -SELECT cdb_geocode_postalcode_polygon('03204', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_postalcode_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_postalcode_polygon invoked with params (test_user, , 03204, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_postalcode_polygon(username, orgname, postal_code, country_name)" -PL/pgSQL function cdb_geocode_postalcode_polygon(text,text) line 15 at SQL statement - cdb_geocode_postalcode_polygon --------------------------------- - -(1 row) - -SELECT cdb_geocode_postalcode_point('03204', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_postalcode_point(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_postalcode_point invoked with params (test_user, , 03204, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_postalcode_point(username, orgname, postal_code, country_name)" -PL/pgSQL function cdb_geocode_postalcode_point(text,text) line 15 at SQL statement - cdb_geocode_postalcode_point ------------------------------- - -(1 row) - -SELECT cdb_geocode_ipaddress_point('8.8.8.8'); -NOTICE: cdb_dataservices_client._cdb_geocode_ipaddress_point(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_ipaddress_point invoked with params (test_user, , 8.8.8.8) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_ipaddress_point(username, orgname, ip_address)" -PL/pgSQL function cdb_geocode_ipaddress_point(text) line 15 at SQL statement - cdb_geocode_ipaddress_point ------------------------------ - -(1 row) - -SELECT cdb_geocode_street_point('one street, 1'); -NOTICE: cdb_dataservices_client._cdb_geocode_street_point(6): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_geocoder_street_point invoked with params (test_user, , one street, 1, , , ) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_street_point(username, orgname, searchtext, city, state_province, country)" -PL/pgSQL function cdb_geocode_street_point(text,text,text,text) line 15 at SQL statement - cdb_geocode_street_point --------------------------- - -(1 row) - --- Check the regular user has no permissions on private functions -SELECT _cdb_geocode_admin0_polygon('evil_user', 'evil_orgname', 'Hell'); -ERROR: permission denied for function _cdb_geocode_admin0_polygon -SELECT _cdb_geocode_admin1_polygon('evil_user', 'evil_orgname', 'Hell'); -ERROR: permission denied for function _cdb_geocode_admin1_polygon -SELECT _cdb_geocode_admin1_polygon('evil_user', 'evil_orgname', 'Sheol', 'Hell'); -ERROR: permission denied for function _cdb_geocode_admin1_polygon -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol'); -ERROR: permission denied for function _cdb_geocode_namedplace_point -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol', 'Hell'); -ERROR: permission denied for function _cdb_geocode_namedplace_point -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol', 'Hell', 'Ugly world'); -ERROR: permission denied for function _cdb_geocode_namedplace_point -SELECT _cdb_geocode_postalcode_polygon('evil_user', 'evil_orgname', '66666', 'Hell'); -ERROR: permission denied for function _cdb_geocode_postalcode_polygon -SELECT _cdb_geocode_postalcode_point('evil_user', 'evil_orgname', '66666', 'Hell'); -ERROR: permission denied for function _cdb_geocode_postalcode_point -SELECT _cdb_geocode_ipaddress_point('evil_user', 'evil_orgname', '8.8.8.8'); -ERROR: permission denied for function _cdb_geocode_ipaddress_point -SELECT _cdb_geocode_street_point('evil_user', 'evil_orgname', 'one street, 1'); -ERROR: permission denied for function _cdb_geocode_street_point diff --git a/client/test/0.1.0/sql/00_installation_test.sql b/client/test/0.1.0/sql/00_installation_test.sql deleted file mode 100644 index fc3395f..0000000 --- a/client/test/0.1.0/sql/00_installation_test.sql +++ /dev/null @@ -1,23 +0,0 @@ --- Install dependencies -CREATE EXTENSION postgis; -CREATE EXTENSION schema_triggers; -CREATE EXTENSION plpythonu; -CREATE EXTENSION cartodb; -CREATE EXTENSION plproxy; - --- Install the extension -CREATE EXTENSION cdb_dataservices_client; - --- Mock the server connection to point to this very test db -SELECT cartodb.cdb_conf_setconf('geocoder_server_config', '{"connection_str": "dbname=contrib_regression host=127.0.0.1 user=postgres"}'); --- Mock the user configuration -SELECT cartodb.cdb_conf_setconf('user_config', '{"is_organization": false, "entity_name": "test_user"}'); - --- Mock the server schema -CREATE SCHEMA cdb_dataservices_server; - --- Create a test user to check permissions -DROP ROLE IF EXISTS test_regular_user; -CREATE ROLE test_regular_user; -GRANT publicuser TO test_regular_user; -ALTER ROLE test_regular_user SET search_path TO public,cartodb,cdb_dataservices_client; diff --git a/client/test/0.1.0/sql/10_admin0_test.sql b/client/test/0.1.0/sql/10_admin0_test.sql deleted file mode 100644 index e6750f1..0000000 --- a/client/test/0.1.0/sql/10_admin0_test.sql +++ /dev/null @@ -1,15 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; - --- Mock the server function -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_admin0_polygon(username text, orgname text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_admin0_polygon invoked with params (%, %, %)', username, orgname, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - - --- Exercise the public and the proxied function -SELECT cdb_geocode_admin0_polygon('Spain'); diff --git a/client/test/0.1.0/sql/20_admin1_test.sql b/client/test/0.1.0/sql/20_admin1_test.sql deleted file mode 100644 index ecd2275..0000000 --- a/client/test/0.1.0/sql/20_admin1_test.sql +++ /dev/null @@ -1,24 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; - --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_admin1_polygon(username text, orgname text, admin1_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params (%, %, %)', username, orgname, admin1_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_admin1_polygon(username text, orgname text, admin1_name text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params (%, %, %, %)', username, orgname, admin1_name, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - - --- Exercise the public and the proxied function -SELECT cdb_geocode_admin1_polygon('California'); -SELECT cdb_geocode_admin1_polygon('California', 'United States'); diff --git a/client/test/0.1.0/sql/30_namedplaces_test.sql b/client/test/0.1.0/sql/30_namedplaces_test.sql deleted file mode 100644 index bdfba65..0000000 --- a/client/test/0.1.0/sql/30_namedplaces_test.sql +++ /dev/null @@ -1,33 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; - --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (%, %, %)', username, orgname, city_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %)', username, orgname, city_name, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text, admin1_name text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %, %)', username, orgname, city_name, admin1_name, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - --- Exercise the public and the proxied function -SELECT cdb_geocode_namedplace_point('Elx'); -SELECT cdb_geocode_namedplace_point('Elx', 'Spain'); -SELECT cdb_geocode_namedplace_point('Elx', 'Valencia', 'Spain'); - diff --git a/client/test/0.1.0/sql/40_postalcodes_test.sql b/client/test/0.1.0/sql/40_postalcodes_test.sql deleted file mode 100644 index c1c2191..0000000 --- a/client/test/0.1.0/sql/40_postalcodes_test.sql +++ /dev/null @@ -1,23 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; - --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_postalcode_polygon(username text, orgname text, postal_code text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_postalcode_polygon invoked with params (%, %, %, %)', username, orgname, postal_code, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_postalcode_point(username text, orgname text, postal_code text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_postalcode_point invoked with params (%, %, %, %)', username, orgname, postal_code, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - --- Exercise the public and the proxied function -SELECT cdb_geocode_postalcode_polygon('03204', 'Spain'); -SELECT cdb_geocode_postalcode_point('03204', 'Spain'); diff --git a/client/test/0.1.0/sql/50_ipaddresses_test.sql b/client/test/0.1.0/sql/50_ipaddresses_test.sql deleted file mode 100644 index c1fd8f7..0000000 --- a/client/test/0.1.0/sql/50_ipaddresses_test.sql +++ /dev/null @@ -1,15 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; - --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_ipaddress_point(username text, orgname text, ip_address text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_ipaddress_point invoked with params (%, %, %)', username, orgname, ip_address; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - - --- Exercise the public and the proxied function -SELECT cdb_geocode_ipaddress_point('8.8.8.8'); diff --git a/client/test/0.1.0/sql/90_permissions_test.sql b/client/test/0.1.0/sql/90_permissions_test.sql deleted file mode 100644 index 88ec14c..0000000 --- a/client/test/0.1.0/sql/90_permissions_test.sql +++ /dev/null @@ -1,30 +0,0 @@ --- Use regular user role -SET ROLE test_regular_user; - --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; - --- Exercise the public function --- it is public, it shall work -SELECT cdb_geocode_admin0_polygon('Spain'); -SELECT cdb_geocode_admin1_polygon('California'); -SELECT cdb_geocode_admin1_polygon('California', 'United States'); -SELECT cdb_geocode_namedplace_point('Elx'); -SELECT cdb_geocode_namedplace_point('Elx', 'Valencia'); -SELECT cdb_geocode_namedplace_point('Elx', 'Valencia', 'Spain'); -SELECT cdb_geocode_postalcode_polygon('03204', 'Spain'); -SELECT cdb_geocode_postalcode_point('03204', 'Spain'); -SELECT cdb_geocode_ipaddress_point('8.8.8.8'); -SELECT cdb_geocode_street_point('one street, 1'); - --- Check the regular user has no permissions on private functions -SELECT _cdb_geocode_admin0_polygon('evil_user', 'evil_orgname', 'Hell'); -SELECT _cdb_geocode_admin1_polygon('evil_user', 'evil_orgname', 'Hell'); -SELECT _cdb_geocode_admin1_polygon('evil_user', 'evil_orgname', 'Sheol', 'Hell'); -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol'); -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol', 'Hell'); -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol', 'Hell', 'Ugly world'); -SELECT _cdb_geocode_postalcode_polygon('evil_user', 'evil_orgname', '66666', 'Hell'); -SELECT _cdb_geocode_postalcode_point('evil_user', 'evil_orgname', '66666', 'Hell'); -SELECT _cdb_geocode_ipaddress_point('evil_user', 'evil_orgname', '8.8.8.8'); -SELECT _cdb_geocode_street_point('evil_user', 'evil_orgname', 'one street, 1'); diff --git a/client/test/0.2.0/expected/00_installation_test.out b/client/test/0.2.0/expected/00_installation_test.out deleted file mode 100644 index 8c6f98d..0000000 --- a/client/test/0.2.0/expected/00_installation_test.out +++ /dev/null @@ -1,29 +0,0 @@ --- Install dependencies -CREATE EXTENSION postgis; -CREATE EXTENSION schema_triggers; -CREATE EXTENSION plpythonu; -CREATE EXTENSION cartodb; -CREATE EXTENSION plproxy; --- Install the extension -CREATE EXTENSION cdb_dataservices_client; --- Mock the server connection to point to this very test db -SELECT cartodb.cdb_conf_setconf('geocoder_server_config', '{"connection_str": "dbname=contrib_regression host=127.0.0.1 user=postgres"}'); - cdb_conf_setconf ------------------- - -(1 row) - --- Mock the user configuration -SELECT cartodb.cdb_conf_setconf('user_config', '{"is_organization": false, "entity_name": "test_user"}'); - cdb_conf_setconf ------------------- - -(1 row) - --- Mock the server schema -CREATE SCHEMA cdb_dataservices_server; --- Create a test user to check permissions -DROP ROLE IF EXISTS test_regular_user; -CREATE ROLE test_regular_user; -GRANT publicuser TO test_regular_user; -ALTER ROLE test_regular_user SET search_path TO public,cartodb,cdb_dataservices_client; diff --git a/client/test/0.2.0/expected/90_permissions_test.out b/client/test/0.2.0/expected/90_permissions_test.out deleted file mode 100644 index 3c12c06..0000000 --- a/client/test/0.2.0/expected/90_permissions_test.out +++ /dev/null @@ -1,117 +0,0 @@ --- Use regular user role -SET ROLE test_regular_user; --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; --- Exercise the public function --- it is public, it shall work -SELECT cdb_geocode_admin0_polygon('Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_admin0_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_admin0_polygon invoked with params (test_user, , Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_admin0_polygon(username, orgname, country_name)" -PL/pgSQL function cdb_geocode_admin0_polygon(text) line 16 at SQL statement - cdb_geocode_admin0_polygon ----------------------------- - -(1 row) - -SELECT cdb_geocode_admin1_polygon('California'); -NOTICE: cdb_dataservices_client._cdb_geocode_admin1_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params (test_user, , California) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_admin1_polygon(username, orgname, admin1_name)" -PL/pgSQL function cdb_geocode_admin1_polygon(text) line 16 at SQL statement - cdb_geocode_admin1_polygon ----------------------------- - -(1 row) - -SELECT cdb_geocode_admin1_polygon('California', 'United States'); -NOTICE: cdb_dataservices_client._cdb_geocode_admin1_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params (test_user, , California, United States) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_admin1_polygon(username, orgname, admin1_name, country_name)" -PL/pgSQL function cdb_geocode_admin1_polygon(text,text) line 16 at SQL statement - cdb_geocode_admin1_polygon ----------------------------- - -(1 row) - -SELECT cdb_geocode_namedplace_point('Elx'); -NOTICE: cdb_dataservices_client._cdb_geocode_namedplace_point(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (test_user, , Elx) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_namedplace_point(username, orgname, city_name)" -PL/pgSQL function cdb_geocode_namedplace_point(text) line 16 at SQL statement - cdb_geocode_namedplace_point ------------------------------- - -(1 row) - -SELECT cdb_geocode_namedplace_point('Elx', 'Valencia'); -NOTICE: cdb_dataservices_client._cdb_geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (test_user, , Elx, Valencia) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_namedplace_point(username, orgname, city_name, country_name)" -PL/pgSQL function cdb_geocode_namedplace_point(text,text) line 16 at SQL statement - cdb_geocode_namedplace_point ------------------------------- - -(1 row) - -SELECT cdb_geocode_namedplace_point('Elx', 'Valencia', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_namedplace_point(5): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (test_user, , Elx, Valencia, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_namedplace_point(username, orgname, city_name, admin1_name, country_name)" -PL/pgSQL function cdb_geocode_namedplace_point(text,text,text) line 16 at SQL statement - cdb_geocode_namedplace_point ------------------------------- - -(1 row) - -SELECT cdb_geocode_postalcode_polygon('03204', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_postalcode_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_postalcode_polygon invoked with params (test_user, , 03204, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_postalcode_polygon(username, orgname, postal_code, country_name)" -PL/pgSQL function cdb_geocode_postalcode_polygon(text,text) line 16 at SQL statement - cdb_geocode_postalcode_polygon --------------------------------- - -(1 row) - -SELECT cdb_geocode_postalcode_point('03204', 'Spain'); -NOTICE: cdb_dataservices_client._cdb_geocode_postalcode_point(4): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_postalcode_point invoked with params (test_user, , 03204, Spain) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_postalcode_point(username, orgname, postal_code, country_name)" -PL/pgSQL function cdb_geocode_postalcode_point(text,text) line 16 at SQL statement - cdb_geocode_postalcode_point ------------------------------- - -(1 row) - -SELECT cdb_geocode_ipaddress_point('8.8.8.8'); -NOTICE: cdb_dataservices_client._cdb_geocode_ipaddress_point(3): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_ipaddress_point invoked with params (test_user, , 8.8.8.8) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_ipaddress_point(username, orgname, ip_address)" -PL/pgSQL function cdb_geocode_ipaddress_point(text) line 16 at SQL statement - cdb_geocode_ipaddress_point ------------------------------ - -(1 row) - -SELECT cdb_geocode_street_point('one street, 1'); -NOTICE: cdb_dataservices_client._cdb_geocode_street_point(6): [contrib_regression] REMOTE NOTICE: cdb_dataservices_server.cdb_geocode_geocoder_street_point invoked with params (test_user, , one street, 1, , , ) -CONTEXT: SQL statement "SELECT cdb_dataservices_client._cdb_geocode_street_point(username, orgname, searchtext, city, state_province, country)" -PL/pgSQL function cdb_geocode_street_point(text,text,text,text) line 16 at SQL statement - cdb_geocode_street_point --------------------------- - -(1 row) - --- Check the regular user has no permissions on private functions -SELECT _cdb_geocode_admin0_polygon('evil_user', 'evil_orgname', 'Hell'); -ERROR: permission denied for function _cdb_geocode_admin0_polygon -SELECT _cdb_geocode_admin1_polygon('evil_user', 'evil_orgname', 'Hell'); -ERROR: permission denied for function _cdb_geocode_admin1_polygon -SELECT _cdb_geocode_admin1_polygon('evil_user', 'evil_orgname', 'Sheol', 'Hell'); -ERROR: permission denied for function _cdb_geocode_admin1_polygon -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol'); -ERROR: permission denied for function _cdb_geocode_namedplace_point -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol', 'Hell'); -ERROR: permission denied for function _cdb_geocode_namedplace_point -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol', 'Hell', 'Ugly world'); -ERROR: permission denied for function _cdb_geocode_namedplace_point -SELECT _cdb_geocode_postalcode_polygon('evil_user', 'evil_orgname', '66666', 'Hell'); -ERROR: permission denied for function _cdb_geocode_postalcode_polygon -SELECT _cdb_geocode_postalcode_point('evil_user', 'evil_orgname', '66666', 'Hell'); -ERROR: permission denied for function _cdb_geocode_postalcode_point -SELECT _cdb_geocode_ipaddress_point('evil_user', 'evil_orgname', '8.8.8.8'); -ERROR: permission denied for function _cdb_geocode_ipaddress_point -SELECT _cdb_geocode_street_point('evil_user', 'evil_orgname', 'one street, 1'); -ERROR: permission denied for function _cdb_geocode_street_point diff --git a/client/test/0.2.0/sql/00_installation_test.sql b/client/test/0.2.0/sql/00_installation_test.sql deleted file mode 100644 index fc3395f..0000000 --- a/client/test/0.2.0/sql/00_installation_test.sql +++ /dev/null @@ -1,23 +0,0 @@ --- Install dependencies -CREATE EXTENSION postgis; -CREATE EXTENSION schema_triggers; -CREATE EXTENSION plpythonu; -CREATE EXTENSION cartodb; -CREATE EXTENSION plproxy; - --- Install the extension -CREATE EXTENSION cdb_dataservices_client; - --- Mock the server connection to point to this very test db -SELECT cartodb.cdb_conf_setconf('geocoder_server_config', '{"connection_str": "dbname=contrib_regression host=127.0.0.1 user=postgres"}'); --- Mock the user configuration -SELECT cartodb.cdb_conf_setconf('user_config', '{"is_organization": false, "entity_name": "test_user"}'); - --- Mock the server schema -CREATE SCHEMA cdb_dataservices_server; - --- Create a test user to check permissions -DROP ROLE IF EXISTS test_regular_user; -CREATE ROLE test_regular_user; -GRANT publicuser TO test_regular_user; -ALTER ROLE test_regular_user SET search_path TO public,cartodb,cdb_dataservices_client; diff --git a/client/test/0.2.0/sql/10_admin0_test.sql b/client/test/0.2.0/sql/10_admin0_test.sql deleted file mode 100644 index e6750f1..0000000 --- a/client/test/0.2.0/sql/10_admin0_test.sql +++ /dev/null @@ -1,15 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; - --- Mock the server function -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_admin0_polygon(username text, orgname text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_admin0_polygon invoked with params (%, %, %)', username, orgname, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - - --- Exercise the public and the proxied function -SELECT cdb_geocode_admin0_polygon('Spain'); diff --git a/client/test/0.2.0/sql/20_admin1_test.sql b/client/test/0.2.0/sql/20_admin1_test.sql deleted file mode 100644 index ecd2275..0000000 --- a/client/test/0.2.0/sql/20_admin1_test.sql +++ /dev/null @@ -1,24 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; - --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_admin1_polygon(username text, orgname text, admin1_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params (%, %, %)', username, orgname, admin1_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_admin1_polygon(username text, orgname text, admin1_name text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_admin1_polygon invoked with params (%, %, %, %)', username, orgname, admin1_name, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - - --- Exercise the public and the proxied function -SELECT cdb_geocode_admin1_polygon('California'); -SELECT cdb_geocode_admin1_polygon('California', 'United States'); diff --git a/client/test/0.2.0/sql/30_namedplaces_test.sql b/client/test/0.2.0/sql/30_namedplaces_test.sql deleted file mode 100644 index bdfba65..0000000 --- a/client/test/0.2.0/sql/30_namedplaces_test.sql +++ /dev/null @@ -1,33 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; - --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (%, %, %)', username, orgname, city_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %)', username, orgname, city_name, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text, admin1_name text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %, %)', username, orgname, city_name, admin1_name, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - --- Exercise the public and the proxied function -SELECT cdb_geocode_namedplace_point('Elx'); -SELECT cdb_geocode_namedplace_point('Elx', 'Spain'); -SELECT cdb_geocode_namedplace_point('Elx', 'Valencia', 'Spain'); - diff --git a/client/test/0.2.0/sql/40_postalcodes_test.sql b/client/test/0.2.0/sql/40_postalcodes_test.sql deleted file mode 100644 index c1c2191..0000000 --- a/client/test/0.2.0/sql/40_postalcodes_test.sql +++ /dev/null @@ -1,23 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; - --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_postalcode_polygon(username text, orgname text, postal_code text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_postalcode_polygon invoked with params (%, %, %, %)', username, orgname, postal_code, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_postalcode_point(username text, orgname text, postal_code text, country_name text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_postalcode_point invoked with params (%, %, %, %)', username, orgname, postal_code, country_name; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - --- Exercise the public and the proxied function -SELECT cdb_geocode_postalcode_polygon('03204', 'Spain'); -SELECT cdb_geocode_postalcode_point('03204', 'Spain'); diff --git a/client/test/0.2.0/sql/50_ipaddresses_test.sql b/client/test/0.2.0/sql/50_ipaddresses_test.sql deleted file mode 100644 index c1fd8f7..0000000 --- a/client/test/0.2.0/sql/50_ipaddresses_test.sql +++ /dev/null @@ -1,15 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; - --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_ipaddress_point(username text, orgname text, ip_address text) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_ipaddress_point invoked with params (%, %, %)', username, orgname, ip_address; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - - --- Exercise the public and the proxied function -SELECT cdb_geocode_ipaddress_point('8.8.8.8'); diff --git a/client/test/0.2.0/sql/60_street_test.sql b/client/test/0.2.0/sql/60_street_test.sql deleted file mode 100644 index cd22b5e..0000000 --- a/client/test/0.2.0/sql/60_street_test.sql +++ /dev/null @@ -1,24 +0,0 @@ --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; - --- Mock the server functions -CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_street_point (username text, orgname text, searchtext text, city text DEFAULT NULL, state_province text DEFAULT NULL, country text DEFAULT NULL) -RETURNS Geometry AS $$ -BEGIN - RAISE NOTICE 'cdb_dataservices_server.cdb_geocode_geocoder_street_point invoked with params (%, %, %, %, %, %)', username, orgname, searchtext, city, state_province, country; - RETURN NULL; -END; -$$ LANGUAGE 'plpgsql'; - - --- Exercise the public and the proxied function -SELECT cdb_geocode_street_point('One street, 1'); -SELECT cdb_geocode_street_point('One street', 'city'); -SELECT cdb_geocode_street_point('One street', 'city', 'state'); -SELECT cdb_geocode_street_point('One street', 'city', 'state', 'country'); -SELECT cdb_geocode_street_point('One street', 'city', NULL, 'country'); -SELECT cdb_geocode_street_point('One street, 1'); -SELECT cdb_geocode_street_point('One street', 'city'); -SELECT cdb_geocode_street_point('One street', 'city', 'state'); -SELECT cdb_geocode_street_point('One street', 'city', 'state', 'country'); -SELECT cdb_geocode_street_point('One street', 'city', NULL, 'country'); diff --git a/client/test/0.2.0/sql/90_permissions_test.sql b/client/test/0.2.0/sql/90_permissions_test.sql deleted file mode 100644 index 88ec14c..0000000 --- a/client/test/0.2.0/sql/90_permissions_test.sql +++ /dev/null @@ -1,30 +0,0 @@ --- Use regular user role -SET ROLE test_regular_user; - --- Add to the search path the schema -SET search_path TO public,cartodb,cdb_dataservices_client; - --- Exercise the public function --- it is public, it shall work -SELECT cdb_geocode_admin0_polygon('Spain'); -SELECT cdb_geocode_admin1_polygon('California'); -SELECT cdb_geocode_admin1_polygon('California', 'United States'); -SELECT cdb_geocode_namedplace_point('Elx'); -SELECT cdb_geocode_namedplace_point('Elx', 'Valencia'); -SELECT cdb_geocode_namedplace_point('Elx', 'Valencia', 'Spain'); -SELECT cdb_geocode_postalcode_polygon('03204', 'Spain'); -SELECT cdb_geocode_postalcode_point('03204', 'Spain'); -SELECT cdb_geocode_ipaddress_point('8.8.8.8'); -SELECT cdb_geocode_street_point('one street, 1'); - --- Check the regular user has no permissions on private functions -SELECT _cdb_geocode_admin0_polygon('evil_user', 'evil_orgname', 'Hell'); -SELECT _cdb_geocode_admin1_polygon('evil_user', 'evil_orgname', 'Hell'); -SELECT _cdb_geocode_admin1_polygon('evil_user', 'evil_orgname', 'Sheol', 'Hell'); -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol'); -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol', 'Hell'); -SELECT _cdb_geocode_namedplace_point('evil_user', 'evil_orgname', 'Sheol', 'Hell', 'Ugly world'); -SELECT _cdb_geocode_postalcode_polygon('evil_user', 'evil_orgname', '66666', 'Hell'); -SELECT _cdb_geocode_postalcode_point('evil_user', 'evil_orgname', '66666', 'Hell'); -SELECT _cdb_geocode_ipaddress_point('evil_user', 'evil_orgname', '8.8.8.8'); -SELECT _cdb_geocode_street_point('evil_user', 'evil_orgname', 'one street, 1'); diff --git a/client/test/0.3.0/expected/00_installation_test.out b/client/test/0.3.0/expected/00_installation_test.out deleted file mode 120000 index c971a1a..0000000 --- a/client/test/0.3.0/expected/00_installation_test.out +++ /dev/null @@ -1 +0,0 @@ -../../0.2.0/expected/00_installation_test.out \ No newline at end of file diff --git a/client/test/0.3.0/expected/10_admin0_test.out b/client/test/0.3.0/expected/10_admin0_test.out deleted file mode 120000 index f4d8bb4..0000000 --- a/client/test/0.3.0/expected/10_admin0_test.out +++ /dev/null @@ -1 +0,0 @@ -../../0.2.0/expected/10_admin0_test.out \ No newline at end of file diff --git a/client/test/0.3.0/expected/20_admin1_test.out b/client/test/0.3.0/expected/20_admin1_test.out deleted file mode 120000 index 9e2dc41..0000000 --- a/client/test/0.3.0/expected/20_admin1_test.out +++ /dev/null @@ -1 +0,0 @@ -../../0.2.0/expected/20_admin1_test.out \ No newline at end of file diff --git a/client/test/0.3.0/expected/30_namedplaces_test.out b/client/test/0.3.0/expected/30_namedplaces_test.out deleted file mode 120000 index 1cc8e82..0000000 --- a/client/test/0.3.0/expected/30_namedplaces_test.out +++ /dev/null @@ -1 +0,0 @@ -../../0.2.0/expected/30_namedplaces_test.out \ No newline at end of file diff --git a/client/test/0.3.0/expected/40_postalcodes_test.out b/client/test/0.3.0/expected/40_postalcodes_test.out deleted file mode 120000 index b5eca98..0000000 --- a/client/test/0.3.0/expected/40_postalcodes_test.out +++ /dev/null @@ -1 +0,0 @@ -../../0.2.0/expected/40_postalcodes_test.out \ No newline at end of file diff --git a/client/test/0.3.0/expected/50_ipaddresses_test.out b/client/test/0.3.0/expected/50_ipaddresses_test.out deleted file mode 120000 index 4e6cf45..0000000 --- a/client/test/0.3.0/expected/50_ipaddresses_test.out +++ /dev/null @@ -1 +0,0 @@ -../../0.2.0/expected/50_ipaddresses_test.out \ No newline at end of file diff --git a/client/test/0.3.0/expected/60_street_test.out b/client/test/0.3.0/expected/60_street_test.out deleted file mode 120000 index a89a234..0000000 --- a/client/test/0.3.0/expected/60_street_test.out +++ /dev/null @@ -1 +0,0 @@ -../../0.2.0/expected/60_street_test.out \ No newline at end of file diff --git a/client/test/0.3.0/sql/00_installation_test.sql b/client/test/0.3.0/sql/00_installation_test.sql deleted file mode 120000 index 57b2753..0000000 --- a/client/test/0.3.0/sql/00_installation_test.sql +++ /dev/null @@ -1 +0,0 @@ -../../0.2.0/sql/00_installation_test.sql \ No newline at end of file diff --git a/client/test/0.3.0/sql/10_admin0_test.sql b/client/test/0.3.0/sql/10_admin0_test.sql deleted file mode 120000 index 42ea0af..0000000 --- a/client/test/0.3.0/sql/10_admin0_test.sql +++ /dev/null @@ -1 +0,0 @@ -../../0.2.0/sql/10_admin0_test.sql \ No newline at end of file diff --git a/client/test/0.3.0/sql/20_admin1_test.sql b/client/test/0.3.0/sql/20_admin1_test.sql deleted file mode 120000 index eff33be..0000000 --- a/client/test/0.3.0/sql/20_admin1_test.sql +++ /dev/null @@ -1 +0,0 @@ -../../0.2.0/sql/20_admin1_test.sql \ No newline at end of file diff --git a/client/test/0.3.0/sql/30_namedplaces_test.sql b/client/test/0.3.0/sql/30_namedplaces_test.sql deleted file mode 120000 index efcb31a..0000000 --- a/client/test/0.3.0/sql/30_namedplaces_test.sql +++ /dev/null @@ -1 +0,0 @@ -../../0.2.0/sql/30_namedplaces_test.sql \ No newline at end of file diff --git a/client/test/0.3.0/sql/40_postalcodes_test.sql b/client/test/0.3.0/sql/40_postalcodes_test.sql deleted file mode 120000 index fc5a4c7..0000000 --- a/client/test/0.3.0/sql/40_postalcodes_test.sql +++ /dev/null @@ -1 +0,0 @@ -../../0.2.0/sql/40_postalcodes_test.sql \ No newline at end of file diff --git a/client/test/0.3.0/sql/50_ipaddresses_test.sql b/client/test/0.3.0/sql/50_ipaddresses_test.sql deleted file mode 120000 index f94e6ad..0000000 --- a/client/test/0.3.0/sql/50_ipaddresses_test.sql +++ /dev/null @@ -1 +0,0 @@ -../../0.2.0/sql/50_ipaddresses_test.sql \ No newline at end of file diff --git a/client/test/0.3.0/sql/60_street_test.sql b/client/test/0.3.0/sql/60_street_test.sql deleted file mode 120000 index 643e51d..0000000 --- a/client/test/0.3.0/sql/60_street_test.sql +++ /dev/null @@ -1 +0,0 @@ -../../0.2.0/sql/60_street_test.sql \ No newline at end of file diff --git a/client/test/0.0.1/expected/00_installation_test.out b/client/test/expected/00_installation_test.out similarity index 100% rename from client/test/0.0.1/expected/00_installation_test.out rename to client/test/expected/00_installation_test.out diff --git a/client/test/0.2.0/expected/10_admin0_test.out b/client/test/expected/10_admin0_test.out similarity index 100% rename from client/test/0.2.0/expected/10_admin0_test.out rename to client/test/expected/10_admin0_test.out diff --git a/client/test/0.2.0/expected/20_admin1_test.out b/client/test/expected/20_admin1_test.out similarity index 100% rename from client/test/0.2.0/expected/20_admin1_test.out rename to client/test/expected/20_admin1_test.out diff --git a/client/test/0.2.0/expected/30_namedplaces_test.out b/client/test/expected/30_namedplaces_test.out similarity index 100% rename from client/test/0.2.0/expected/30_namedplaces_test.out rename to client/test/expected/30_namedplaces_test.out diff --git a/client/test/0.2.0/expected/40_postalcodes_test.out b/client/test/expected/40_postalcodes_test.out similarity index 100% rename from client/test/0.2.0/expected/40_postalcodes_test.out rename to client/test/expected/40_postalcodes_test.out diff --git a/client/test/0.2.0/expected/50_ipaddresses_test.out b/client/test/expected/50_ipaddresses_test.out similarity index 100% rename from client/test/0.2.0/expected/50_ipaddresses_test.out rename to client/test/expected/50_ipaddresses_test.out diff --git a/client/test/0.2.0/expected/60_street_test.out b/client/test/expected/60_street_test.out similarity index 100% rename from client/test/0.2.0/expected/60_street_test.out rename to client/test/expected/60_street_test.out diff --git a/client/test/0.3.0/expected/80_route_point_to_point_test.out b/client/test/expected/80_route_point_to_point_test.out similarity index 100% rename from client/test/0.3.0/expected/80_route_point_to_point_test.out rename to client/test/expected/80_route_point_to_point_test.out diff --git a/client/test/0.3.0/expected/90_permissions_test.out b/client/test/expected/90_permissions_test.out similarity index 100% rename from client/test/0.3.0/expected/90_permissions_test.out rename to client/test/expected/90_permissions_test.out diff --git a/client/test/0.0.1/sql/00_installation_test.sql b/client/test/sql/00_installation_test.sql similarity index 100% rename from client/test/0.0.1/sql/00_installation_test.sql rename to client/test/sql/00_installation_test.sql diff --git a/client/test/0.0.1/sql/10_admin0_test.sql b/client/test/sql/10_admin0_test.sql similarity index 100% rename from client/test/0.0.1/sql/10_admin0_test.sql rename to client/test/sql/10_admin0_test.sql diff --git a/client/test/0.0.1/sql/20_admin1_test.sql b/client/test/sql/20_admin1_test.sql similarity index 100% rename from client/test/0.0.1/sql/20_admin1_test.sql rename to client/test/sql/20_admin1_test.sql diff --git a/client/test/0.0.1/sql/30_namedplaces_test.sql b/client/test/sql/30_namedplaces_test.sql similarity index 100% rename from client/test/0.0.1/sql/30_namedplaces_test.sql rename to client/test/sql/30_namedplaces_test.sql diff --git a/client/test/0.0.1/sql/40_postalcodes_test.sql b/client/test/sql/40_postalcodes_test.sql similarity index 100% rename from client/test/0.0.1/sql/40_postalcodes_test.sql rename to client/test/sql/40_postalcodes_test.sql diff --git a/client/test/0.0.1/sql/50_ipaddresses_test.sql b/client/test/sql/50_ipaddresses_test.sql similarity index 100% rename from client/test/0.0.1/sql/50_ipaddresses_test.sql rename to client/test/sql/50_ipaddresses_test.sql diff --git a/client/test/0.1.0/sql/60_street_test.sql b/client/test/sql/60_street_test.sql similarity index 100% rename from client/test/0.1.0/sql/60_street_test.sql rename to client/test/sql/60_street_test.sql diff --git a/client/test/0.3.0/sql/80_route_point_to_point_test.sql b/client/test/sql/80_route_point_to_point_test.sql similarity index 100% rename from client/test/0.3.0/sql/80_route_point_to_point_test.sql rename to client/test/sql/80_route_point_to_point_test.sql diff --git a/client/test/0.3.0/sql/90_permissions_test.sql b/client/test/sql/90_permissions_test.sql similarity index 100% rename from client/test/0.3.0/sql/90_permissions_test.sql rename to client/test/sql/90_permissions_test.sql