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

Merge pull request #20 from CartoDB/fix-client-extension-test

Browse Source 
Fix client extension test
This commit is contained in:
Rafa de la Torre 2015-11-11 19:00:32 +01:00
commit 211896a5ed
5 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/expected/00_installation_test.out
View File

@ -3,3 +3,12 @@ CREATE EXTENSION postgis;
CREATE EXTENSION plproxy; CREATE EXTENSION plproxy;
-- Install the extension -- Install the extension
CREATE EXTENSION cdb_geocoder_client; CREATE EXTENSION cdb_geocoder_client;
-- Mock the server connection to point to this very test db
SELECT cdb_geocoder_client._config_set('db_server_config', '{"connection_str": "dbname=contrib_regression host=127.0.0.1 user=postgres"}');
_config_set
-------------
(1 row)
-- Mock the server schema
CREATE SCHEMA cdb_geocoder_server;

18
client/expected/10_admin0_test.out Normal file
View File

@ -0,0 +1,18 @@
-- Mock the server function
CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin0_polygons(user_id name, tx_id bigint, country_name text)
RETURNS Geometry AS $$
BEGIN
RAISE NOTICE 'cbd_geocoder_server.geocode_admin0_polygons invoked with params (%, %, %)', user_id, 'some_transaction_id', country_name;
RETURN NULL;
END;
$$ LANGUAGE 'plpgsql';
-- Exercise the public and the proxied function
SELECT cdb_geocoder_client.geocode_admin0_polygons('Spain');
NOTICE: cdb_geocoder_client._geocode_admin0_polygons(3): [contrib_regression] REMOTE NOTICE: cbd_geocoder_server.geocode_admin0_polygons invoked with params (postgres, some_transaction_id, Spain)
CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_admin0_polygons(session_user, txid_current(), country_name)"
PL/pgSQL function cdb_geocoder_client.geocode_admin0_polygons(text) line 5 at SQL statement
geocode_admin0_polygons
-------------------------
(1 row)

1
client/sql/0.0.1/10_admin0.sql
View File

@ -21,7 +21,6 @@ $$ LANGUAGE 'plpgsql' SECURITY DEFINER;
CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_admin0_polygons(user_id name, tx_id bigint, country_name text) CREATE OR REPLACE FUNCTION cdb_geocoder_client._geocode_admin0_polygons(user_id name, tx_id bigint, country_name text)
RETURNS Geometry AS $$ RETURNS Geometry AS $$
-- TODO check if we can move the config to its own function
CONNECT cdb_geocoder_client._server_conn_str(); CONNECT cdb_geocoder_client._server_conn_str();
SELECT cdb_geocoder_server.geocode_admin0_polygons(user_id, tx_id, country_name); SELECT cdb_geocoder_server.geocode_admin0_polygons(user_id, tx_id, country_name);
$$ LANGUAGE plproxy; $$ LANGUAGE plproxy;

6
client/sql/00_installation_test.sql
View File

@ -4,3 +4,9 @@ CREATE EXTENSION plproxy;
-- Install the extension -- Install the extension
CREATE EXTENSION cdb_geocoder_client; CREATE EXTENSION cdb_geocoder_client;
-- Mock the server connection to point to this very test db
SELECT cdb_geocoder_client._config_set('db_server_config', '{"connection_str": "dbname=contrib_regression host=127.0.0.1 user=postgres"}');
-- Mock the server schema
CREATE SCHEMA cdb_geocoder_server;

12
client/sql/10_admin0_test.sql
View File

@ -0,0 +1,12 @@
-- Mock the server function
CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin0_polygons(user_id name, tx_id bigint, country_name text)
RETURNS Geometry AS $$
BEGIN
RAISE NOTICE 'cbd_geocoder_server.geocode_admin0_polygons invoked with params (%, %, %)', user_id, 'some_transaction_id', country_name;
RETURN NULL;
END;
$$ LANGUAGE 'plpgsql';
-- Exercise the public and the proxied function
SELECT cdb_geocoder_client.geocode_admin0_polygons('Spain');