Update README.md

Add LICENSE file
Merge pull request #59 from CartoDB/integration_test_readme
2015-12-23 16:00:51 +01:00 · 2015-12-22 18:13:46 +01:00 · 2015-12-09 14:37:43 +01:00 · 2015-12-09 14:12:48 +01:00 · 2015-12-09 13:25:23 +01:00 · 2015-12-09 13:24:16 +01:00
55 changed files with 1005 additions and 466 deletions
--- a/27
+++ b/27
@@ -0,0 +1,27 @@
+Copyright (c) 2015, CartoDB
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this 
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, 
+this list of conditions and the following disclaimer in the documentation 
+and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors 
+may be used to endorse or promote products derived from this software without 
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE 
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/client/README.md
+++ b/client/README.md
@@ -30,8 +30,6 @@ sudo PGUSER=postgres make all install installcheck

 ## Install onto a cartodb user's database

-Remember that **is mandatory to install it on top of cdb_geocoder**
-
 ```
 psql -U postgres cartodb_dev_user_fe3b850a-01c0-48f9-8a26-a82f09e9b53f_db
 ```
--- a/client/expected/00_installation_test.out
+++ b/client/expected/00_installation_test.out
@@ -20,13 +20,6 @@ SELECT cartodb.cdb_conf_setconf('user_config', '{"is_organization": false, "enti
 
 (1 row)

-- Mock the geocoder configuration
-SELECT cartodb.cdb_conf_setconf('geocoder_config', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}');
- cdb_conf_setconf 
------------------
- 
-(1 row)
-
 -- Mock the server schema
 CREATE SCHEMA cdb_geocoder_server;
 -- Create a test user to check permissions
--- a/client/expected/10_admin0_test.out
+++ b/client/expected/10_admin0_test.out
@@ -1,18 +1,18 @@
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_geocoder_client;
 -- Mock the server function
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin0_polygon(user_id name, user_config JSON, geocoder_config JSON, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin0_polygon(username text, orgname text, country_name text)
 RETURNS Geometry AS $$
 BEGIN
-  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_admin0_polygon invoked with params (%, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}' , country_name;
+  RAISE NOTICE 'cdb_geocoder_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_geocoder_client._cdb_geocode_admin0_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin0_polygon invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, Spain)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_admin0_polygon(session_user, user_config, geocoder_config, country_name)"
-PL/pgSQL function cdb_geocode_admin0_polygon(text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_admin0_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin0_polygon invoked with params ("test_user", <NULL>, Spain)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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 
 ----------------------------
 
--- a/client/expected/20_admin1_test.out
+++ b/client/expected/20_admin1_test.out
@@ -1,34 +1,34 @@
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_geocoder_client;
 -- Mock the server functions
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin1_polygon(user_id name, user_config JSON, geocoder_config JSON, admin1_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin1_polygon(username text, orgname text, admin1_name text)
 RETURNS Geometry AS $$
 BEGIN
-  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params (%, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', admin1_name;
+  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params (%, %, %)', username, orgname, admin1_name;
  RETURN NULL;
 END;
 $$ LANGUAGE 'plpgsql';
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin1_polygon(user_id name, user_config JSON, geocoder_config JSON, admin1_name text, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin1_polygon(username text, orgname text, admin1_name text, country_name text)
 RETURNS Geometry AS $$
 BEGIN
-  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params (%, %, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', admin1_name, country_name;
+  RAISE NOTICE 'cdb_geocoder_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_geocoder_client._cdb_geocode_admin1_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, California)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_admin1_polygon(session_user, user_config, geocoder_config, admin1_name)"
-PL/pgSQL function cdb_geocode_admin1_polygon(text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_admin1_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params ("test_user", <NULL>, California)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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_geocoder_client._cdb_geocode_admin1_polygon(5): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, California, United States)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_admin1_polygon(session_user, user_config, geocoder_config, admin1_name, country_name)"
-PL/pgSQL function cdb_geocode_admin1_polygon(text,text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_admin1_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params ("test_user", <NULL>, California, United States)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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 
 ----------------------------
 
--- a/client/expected/30_namedplaces_test.out
+++ b/client/expected/30_namedplaces_test.out
@@ -1,50 +1,50 @@
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_geocoder_client;
 -- Mock the server functions
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_namedplace_point(user_id name, user_config JSON, geocoder_config JSON, city_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text)
 RETURNS Geometry AS $$
 BEGIN
-  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', city_name;
+  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params (%, %, %)', username, orgname, city_name;
  RETURN NULL;
 END;
 $$ LANGUAGE 'plpgsql';
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_namedplace_point(user_id name, user_config JSON, geocoder_config JSON, city_name text, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text, country_name text)
 RETURNS Geometry AS $$
 BEGIN
-  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', city_name, country_name;
+  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %)', username, orgname, city_name, country_name;
  RETURN NULL;
 END;
 $$ LANGUAGE 'plpgsql';
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_namedplace_point(user_id name, user_config JSON, geocoder_config JSON, city_name text, admin1_name text, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_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_geocoder_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', city_name, admin1_name, country_name;
+  RAISE NOTICE 'cdb_geocoder_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_geocoder_client._cdb_geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, Elx)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_namedplace_point(session_user, user_config, geocoder_config, city_name)"
-PL/pgSQL function cdb_geocode_namedplace_point(text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_namedplace_point(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params ("test_user", <NULL>, Elx)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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_geocoder_client._cdb_geocode_namedplace_point(5): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, Elx, Spain)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_namedplace_point(session_user, user_config, geocoder_config, city_name, country_name)"
-PL/pgSQL function cdb_geocode_namedplace_point(text,text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params ("test_user", <NULL>, Elx, Spain)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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_geocoder_client._cdb_geocode_namedplace_point(6): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, Elx, Valencia, Spain)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_namedplace_point(session_user, user_config, geocoder_config, city_name, admin1_name, country_name)"
-PL/pgSQL function cdb_geocode_namedplace_point(text,text,text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_namedplace_point(5): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params ("test_user", <NULL>, Elx, Valencia, Spain)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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 
 ------------------------------
 
--- a/client/expected/40_postalcodes_test.out
+++ b/client/expected/40_postalcodes_test.out
@@ -1,34 +1,34 @@
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_geocoder_client;
 -- Mock the server functions
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_postalcode_polygon(user_id name, user_config JSON, geocoder_config JSON, postal_code text, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_postalcode_polygon(username text, orgname text, postal_code text, country_name text)
 RETURNS Geometry AS $$
 BEGIN
-  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_postalcode_polygon invoked with params (%, %, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', postal_code, country_name;
+  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_postalcode_polygon invoked with params (%, %, %, %)', username, orgname, postal_code, country_name;
  RETURN NULL;
 END;
 $$ LANGUAGE 'plpgsql';
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_postalcode_point(user_id name, user_config JSON, geocoder_config JSON, postal_code text, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_postalcode_point(username text, orgname text, postal_code text, country_name text)
 RETURNS Geometry AS $$
 BEGIN
-  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_postalcode_point invoked with params (%, %, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', postal_code, country_name;
+  RAISE NOTICE 'cdb_geocoder_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_geocoder_client._cdb_geocode_postalcode_polygon(5): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_postalcode_polygon invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, 03204, Spain)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_postalcode_polygon(session_user, user_config, geocoder_config, postal_code, country_name)"
-PL/pgSQL function cdb_geocode_postalcode_polygon(text,text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_postalcode_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_postalcode_polygon invoked with params ("test_user", <NULL>, 03204, Spain)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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_geocoder_client._cdb_geocode_postalcode_point(5): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_postalcode_point invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, 03204, Spain)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_postalcode_point(session_user, user_config, geocoder_config, postal_code, country_name)"
-PL/pgSQL function cdb_geocode_postalcode_point(text,text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_postalcode_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_postalcode_point invoked with params ("test_user", <NULL>, 03204, Spain)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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 
 ------------------------------
 
--- a/client/expected/50_ipaddresses_test.out
+++ b/client/expected/50_ipaddresses_test.out
@@ -1,18 +1,18 @@
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_geocoder_client;
 -- Mock the server functions
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_ipaddress_point(user_id name, user_config JSON, geocoder_config JSON, ip_address text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_ipaddress_point(username text, orgname text, ip_address text)
 RETURNS Geometry AS $$
 BEGIN
-  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_ipaddress_point invoked with params (%, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', ip_address;
+  RAISE NOTICE 'cdb_geocoder_server.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_geocoder_client._cdb_geocode_ipaddress_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_ipaddress_point invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, 8.8.8.8)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_ipaddress_point(session_user, user_config, geocoder_config, ip_address)"
-PL/pgSQL function cdb_geocode_ipaddress_point(text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_ipaddress_point(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_ipaddress_point invoked with params ("test_user", <NULL>, 8.8.8.8)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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 
 -----------------------------
 
--- a/client/expected/90_permissions_test.out
+++ b/client/expected/90_permissions_test.out
@@ -5,102 +5,102 @@ SET search_path TO public,cartodb,cdb_geocoder_client;
 -- Exercise the public function
 -- it is public, it shall work
 SELECT cdb_geocode_admin0_polygon('Spain');
-NOTICE:  cdb_geocoder_client._cdb_geocode_admin0_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin0_polygon invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, Spain)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_admin0_polygon(session_user, user_config, geocoder_config, country_name)"
-PL/pgSQL function cdb_geocode_admin0_polygon(text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_admin0_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin0_polygon invoked with params ("test_user", <NULL>, Spain)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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_geocoder_client._cdb_geocode_admin1_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, California)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_admin1_polygon(session_user, user_config, geocoder_config, admin1_name)"
-PL/pgSQL function cdb_geocode_admin1_polygon(text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_admin1_polygon(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params ("test_user", <NULL>, California)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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_geocoder_client._cdb_geocode_admin1_polygon(5): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, California, United States)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_admin1_polygon(session_user, user_config, geocoder_config, admin1_name, country_name)"
-PL/pgSQL function cdb_geocode_admin1_polygon(text,text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_admin1_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params ("test_user", <NULL>, California, United States)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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_geocoder_client._cdb_geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, Elx)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_namedplace_point(session_user, user_config, geocoder_config, city_name)"
-PL/pgSQL function cdb_geocode_namedplace_point(text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_namedplace_point(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params ("test_user", <NULL>, Elx)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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_geocoder_client._cdb_geocode_namedplace_point(5): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, Elx, Valencia)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_namedplace_point(session_user, user_config, geocoder_config, city_name, country_name)"
-PL/pgSQL function cdb_geocode_namedplace_point(text,text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_namedplace_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params ("test_user", <NULL>, Elx, Valencia)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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_geocoder_client._cdb_geocode_namedplace_point(6): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, Elx, Valencia, Spain)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_namedplace_point(session_user, user_config, geocoder_config, city_name, admin1_name, country_name)"
-PL/pgSQL function cdb_geocode_namedplace_point(text,text,text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_namedplace_point(5): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params ("test_user", <NULL>, Elx, Valencia, Spain)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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_geocoder_client._cdb_geocode_postalcode_polygon(5): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_postalcode_polygon invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, 03204, Spain)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_postalcode_polygon(session_user, user_config, geocoder_config, postal_code, country_name)"
-PL/pgSQL function cdb_geocode_postalcode_polygon(text,text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_postalcode_polygon(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_postalcode_polygon invoked with params ("test_user", <NULL>, 03204, Spain)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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_geocoder_client._cdb_geocode_postalcode_point(5): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_postalcode_point invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, 03204, Spain)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_postalcode_point(session_user, user_config, geocoder_config, postal_code, country_name)"
-PL/pgSQL function cdb_geocode_postalcode_point(text,text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_postalcode_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_postalcode_point invoked with params ("test_user", <NULL>, 03204, Spain)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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_geocoder_client._cdb_geocode_ipaddress_point(4): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_ipaddress_point invoked with params (postgres, {"is_organization": false, "entity_name": "test_user"}, {"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}, 8.8.8.8)
-CONTEXT:  SQL statement "SELECT cdb_geocoder_client._cdb_geocode_ipaddress_point(session_user, user_config, geocoder_config, ip_address)"
-PL/pgSQL function cdb_geocode_ipaddress_point(text) line 12 at SQL statement
+NOTICE:  cdb_geocoder_client._cdb_geocode_ipaddress_point(3): [contrib_regression] REMOTE NOTICE: cdb_geocoder_server.cdb_geocode_ipaddress_point invoked with params ("test_user", <NULL>, 8.8.8.8)
+CONTEXT:  SQL statement "SELECT cdb_geocoder_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', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Hell');
+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', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Hell');
+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', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Sheol', 'Hell');
+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', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Sheol');
+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', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Sheol', 'Hell');
+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', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Sheol', 'Hell', 'Ugly world');
+SELECT _cdb_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', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '66666', 'Hell');
+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', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '66666', 'Hell');
+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', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '8.8.8.8');
+SELECT _cdb_geocode_ipaddress_point('evil_user', 'evil_orgname', '8.8.8.8');
 ERROR:  permission denied for function _cdb_geocode_ipaddress_point
--- a/client/sql/0.0.1/15_config_management.sql
+++ b/client/sql/0.0.1/15_config_management.sql
@@ -0,0 +1,37 @@
+CREATE TYPE cdb_geocoder_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_geocoder_client._cdb_entity_config()
+RETURNS record AS $$
+DECLARE
+    result cdb_geocoder_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;
--- a/client/sql/00_installation_test.sql
+++ b/client/sql/00_installation_test.sql
@@ -12,8 +12,6 @@ CREATE EXTENSION cdb_geocoder_client;
 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 geocoder configuration
-SELECT cartodb.cdb_conf_setconf('geocoder_config', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}');

 -- Mock the server schema
 CREATE SCHEMA cdb_geocoder_server;
--- a/client/sql/10_admin0_test.sql
+++ b/client/sql/10_admin0_test.sql
@@ -2,10 +2,10 @@
 SET search_path TO public,cartodb,cdb_geocoder_client;

 -- Mock the server function
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin0_polygon(user_id name, user_config JSON, geocoder_config JSON, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin0_polygon(username text, orgname text, country_name text)
 RETURNS Geometry AS $$
 BEGIN
-  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_admin0_polygon invoked with params (%, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}' , country_name;
+  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_admin0_polygon invoked with params (%, %, %)', username, orgname, country_name;
  RETURN NULL;
 END;
 $$ LANGUAGE 'plpgsql';
--- a/client/sql/20_admin1_test.sql
+++ b/client/sql/20_admin1_test.sql
@@ -2,18 +2,18 @@
 SET search_path TO public,cartodb,cdb_geocoder_client;

 -- Mock the server functions
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin1_polygon(user_id name, user_config JSON, geocoder_config JSON, admin1_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin1_polygon(username text, orgname text, admin1_name text)
 RETURNS Geometry AS $$
 BEGIN
-  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params (%, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', admin1_name;
+  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params (%, %, %)', username, orgname, admin1_name;
  RETURN NULL;
 END;
 $$ LANGUAGE 'plpgsql';

-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin1_polygon(user_id name, user_config JSON, geocoder_config JSON, admin1_name text, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin1_polygon(username text, orgname text, admin1_name text, country_name text)
 RETURNS Geometry AS $$
 BEGIN
-  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params (%, %, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', admin1_name, country_name;
+  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_admin1_polygon invoked with params (%, %, %, %)', username, orgname, admin1_name, country_name;
  RETURN NULL;
 END;
 $$ LANGUAGE 'plpgsql';
--- a/client/sql/30_namedplaces_test.sql
+++ b/client/sql/30_namedplaces_test.sql
@@ -2,26 +2,26 @@
 SET search_path TO public,cartodb,cdb_geocoder_client;

 -- Mock the server functions
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_namedplace_point(user_id name, user_config JSON, geocoder_config JSON, city_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text)
 RETURNS Geometry AS $$
 BEGIN
-  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', city_name;
+  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params (%, %, %)', username, orgname, city_name;
  RETURN NULL;
 END;
 $$ LANGUAGE 'plpgsql';

-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_namedplace_point(user_id name, user_config JSON, geocoder_config JSON, city_name text, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text, country_name text)
 RETURNS Geometry AS $$
 BEGIN
-  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', city_name, country_name;
+  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %)', username, orgname, city_name, country_name;
  RETURN NULL;
 END;
 $$ LANGUAGE 'plpgsql';

-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_namedplace_point(user_id name, user_config JSON, geocoder_config JSON, city_name text, admin1_name text, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_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_geocoder_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', city_name, admin1_name, country_name;
+  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_namedplace_point invoked with params (%, %, %, %, %)', username, orgname, city_name, admin1_name, country_name;
  RETURN NULL;
 END;
 $$ LANGUAGE 'plpgsql';
--- a/client/sql/40_postalcodes_test.sql
+++ b/client/sql/40_postalcodes_test.sql
@@ -2,18 +2,18 @@
 SET search_path TO public,cartodb,cdb_geocoder_client;

 -- Mock the server functions
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_postalcode_polygon(user_id name, user_config JSON, geocoder_config JSON, postal_code text, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_postalcode_polygon(username text, orgname text, postal_code text, country_name text)
 RETURNS Geometry AS $$
 BEGIN
-  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_postalcode_polygon invoked with params (%, %, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', postal_code, country_name;
+  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_postalcode_polygon invoked with params (%, %, %, %)', username, orgname, postal_code, country_name;
  RETURN NULL;
 END;
 $$ LANGUAGE 'plpgsql';

-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_postalcode_point(user_id name, user_config JSON, geocoder_config JSON, postal_code text, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_postalcode_point(username text, orgname text, postal_code text, country_name text)
 RETURNS Geometry AS $$
 BEGIN
-  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_postalcode_point invoked with params (%, %, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', postal_code, country_name;
+  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_postalcode_point invoked with params (%, %, %, %)', username, orgname, postal_code, country_name;
  RETURN NULL;
 END;
 $$ LANGUAGE 'plpgsql';
--- a/client/sql/50_ipaddresses_test.sql
+++ b/client/sql/50_ipaddresses_test.sql
@@ -2,10 +2,10 @@
 SET search_path TO public,cartodb,cdb_geocoder_client;

 -- Mock the server functions
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_ipaddress_point(user_id name, user_config JSON, geocoder_config JSON, ip_address text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_ipaddress_point(username text, orgname text, ip_address text)
 RETURNS Geometry AS $$
 BEGIN
-  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_ipaddress_point invoked with params (%, %, %, %)', user_id, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', ip_address;
+  RAISE NOTICE 'cdb_geocoder_server.cdb_geocode_ipaddress_point invoked with params (%, %, %)', username, orgname, ip_address;
  RETURN NULL;
 END;
 $$ LANGUAGE 'plpgsql';
--- a/client/sql/90_permissions_test.sql
+++ b/client/sql/90_permissions_test.sql
@@ -17,12 +17,12 @@ 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', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Hell');
-SELECT _cdb_geocode_admin1_polygon('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Hell');
-SELECT _cdb_geocode_admin1_polygon('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Sheol', 'Hell');
-SELECT _cdb_geocode_namedplace_point('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Sheol');
-SELECT _cdb_geocode_namedplace_point('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Sheol', 'Hell');
-SELECT _cdb_geocode_namedplace_point('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Sheol', 'Hell', 'Ugly world');
-SELECT _cdb_geocode_postalcode_polygon('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '66666', 'Hell');
-SELECT _cdb_geocode_postalcode_point('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '66666', 'Hell');
-SELECT _cdb_geocode_ipaddress_point('evil_user', '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '8.8.8.8');
+SELECT _cdb_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');
--- a/client/templates/20_public_functions.erb
+++ b/client/templates/20_public_functions.erb
@@ -8,15 +8,18 @@ CREATE OR REPLACE FUNCTION <%= GEOCODER_CLIENT_SCHEMA %>.<%= name %> (<%= params
 RETURNS <%= return_type %> AS $$
 DECLARE
  ret <%= return_type %>;
-  user_config json;
-  geocoder_config json;
+  username text;
+  orgname text;
 BEGIN
  IF session_user = 'publicuser' OR session_user ~ 'cartodb_publicuser_*' THEN
    RAISE EXCEPTION 'The api_key must be provided';
  END IF;
-  SELECT cartodb.CDB_Conf_GetConf('<%= user_config_key %>') INTO user_config;
-  SELECT cartodb.CDB_Conf_GetConf('<%= geocoder_config_key %>') INTO geocoder_config;
-  SELECT <%= GEOCODER_CLIENT_SCHEMA %>._<%= name %>(session_user, user_config, geocoder_config, <%= params %>) INTO ret;
+  SELECT u, o INTO username, orgname FROM _cdb_entity_config() AS (u text, o text);
+  -- JSON value stored "" is taken as literal
+  IF username IS NULL OR username = '' OR username = '""' THEN
+    RAISE EXCEPTION 'Username is a mandatory argument, check it out';
+  END IF;
+  SELECT <%= GEOCODER_CLIENT_SCHEMA %>._<%= name %>(username, orgname, <%= params %>) INTO ret;
  RETURN ret;
 END;
 $$ LANGUAGE 'plpgsql' SECURITY DEFINER;
--- a/client/templates/30_plproxy_functions.erb
+++ b/client/templates/30_plproxy_functions.erb
@@ -1,6 +1,6 @@
-CREATE OR REPLACE FUNCTION <%= GEOCODER_CLIENT_SCHEMA %>._<%= name %> (user_id name, user_config json, geocoder_config json, <%= params_with_type %>)
+CREATE OR REPLACE FUNCTION <%= GEOCODER_CLIENT_SCHEMA %>._<%= name %> (username text, organization_name text, <%= params_with_type %>)
 RETURNS <%= return_type %> AS $$
  CONNECT <%= GEOCODER_CLIENT_SCHEMA %>._server_conn_str();
-  SELECT cdb_geocoder_server.<%= name %> (user_id, user_config, geocoder_config, <%= params %>);
+  SELECT cdb_geocoder_server.<%= name %> (username, organization_name, <%= params %>);
 $$ LANGUAGE plproxy;

--- a/doc/API.md
+++ b/doc/API.md
@@ -1,238 +1,9 @@
-## Geocoder API
+# Geocoder API

-### Overview
 The CartoDB Geocoder API allows you to match your data with geometries on your map. This geocoding service can be used programatically to geocode datasets via the CartoDB SQL API. It is fed from _Open Data_ and it serves geometries for countries, provinces, states, cities, postal codes and IP addresses.

-### Quickstart
-If you are using the set of APIs and libraries that CartoDB offers and you are handling your data with the SQL API, you can make your data visible in your maps by geocoding the dataset programatically.
-
-Here's an example of how to geocode a single country:
-
-```bash
-https://{username}.cartodb.com/api/v2/sql?q=SELECT cdb_geocode_admin0_polygon('USA')&api_key={Your API key}
-```
-
-In order to geocode an existent CartoDB dataset, an SQL UPDATE statement must be used to populate the geometry column in the dataset with the results of the Geocoding API. If the column in which we are storing the country names for each one of our rows is called `country_column`, we can run the following statement in order to geocode the dataset:
-
-```bash
-https://{username}.cartodb.com/api/v2/sql?q=UPDATE {tablename} SET the_geom = cdb_geocode_admin0_polygon({country_column})&api_key={Your API key}
-```
-
-Notice that you can make use of Postgres or PostGIS functions in your Geocoder API requests, as the result of it will be a geometry that can be handled by the system. As an example, if you need to retrieve the centroid of a specific country, you can wrap the resulting geometry from the Geocoder API inside the PostGIS `ST_Centroid` function:
-
-```bash
-https://{username}.cartodb.com/api/v2/sql?q=SELECT ST_Centroid(cdb_geocode_admin0_polygon('USA'))&api_key={Your API key}
-```
-
-### General concepts
-The Geocoder API offers geocoding services on top of the CartoDB SQL API by means of a set of geocoding functions. Each one of these functions is oriented to one kind of geocoding operation and it will return the corresponding geometry (a `polygon` or a `point`) according to the input information.
-
-The Geocoder API decouples the geocoding service from the CartoDB Editor, and allows to geocode data (being single rows, complete datasets or simple inputs) programatically through authenticated requests.
-
-The geometries provided by this API are projected in the projection [WGS 84 SRID 4326](http://spatialreference.org/ref/epsg/wgs-84/).
-
-The Geocoder API can return different types of geometries (points or polygons) as result of different geocoding processes. The CartoDB platform does not support multigeometry layers or datasets, therefore the final users of this Geocoder API must check that they are using consistent geometry types inside a table to avoid further conflicts in the map visualization.
-
-#### Authentication
-All requests performed to the CartoDB Geocoder API must be authenticated with the user API Key. For more information about where to find your API Key and how to authenticate your SQL API requests, check the [SQL API authentication(http://docs.cartodb.com/cartodb-platform/sql-api/authentication/) guide.
-
-#### Errors
-Errors will be described in the response of the geocoder request. An example is as follows:
-
-  ```json
-  {
-     error: [
-          "function cdb_geocode_countries(text) does not exist"
-     ]
-  }
-  ```
-
-Due to the fact that the Geocoder API is used on top of the CartoDB SQL API you can check the [Making calls to the SQL API](http://docs.cartodb.com/cartodb-platform/sql-api/making-calls/) section to help you debug your SQL errors.
-
-If the requested information is not in the CartoDB geocoding database, or if CartoDB is unable of recognizing your input and matching it with a result, the geocoding function will return `null` as a result. 
-
-#### Limits
-The usage of the Geocoder API is subject to the CartoDB SQL API limits stated in our [Terms of Service](https://cartodb.com/terms/#excessive).
-
-### Reference
-#### Geocoding functions
-The available geocoding functions are listed below, grouped by categories.
-
-##### Country geocoder
-This function provides a country geocoding service. It recognizes the names of the different countries from different synonyms, such as their English name, their endonym, or their ISO2 or ISO3 codes. 
-
-###### cdb_geocode_admin0_polygon
-
-  * `cdb_geocode_admin0_polygon(country_name text)`
-     * **Parameters**: 
-        * Name: `country_name` Type: `text` Description: Name of the country
-     * **Return type:** Geometry (polygon)
-     * **Usage example:**
-     
-       SELECT
-       `````
-       SELECT cdb_geocode_admin0_polygon('France')
-       `````
-
-       UPDATE
-       `````
-       UPDATE {tablename} SET {the_geom} = cdb_geocode_admin0_polygon({country_column})
-       `````
-
-#### Level-1 Administrative regions geocoder
-The following functions provide a geocoding service for administrative regions of level 1 (or NUTS-1) such as states for the United States, regions in France or autonomous communities in Spain.
-
-###### cdb_geocode_admin1_polygon
-* Functions: 
-  * `cdb_geocode_admin1_polygon(admin1_name text)`
-    * **Parameters**: 
-        * Name: `admin1_name` Type: `text` Description: Name of the province/state
-    * **Return type:** Geometry (polygon)
-    * **Usage example:**
-    
-      SELECT
-      `````
-      SELECT cdb_geocode_admin1_polygon('Alicante')
-      `````
-
-      UPDATE
-      `````
-      UPDATE {tablename} SET the_geom = cdb_geocode_admin1_polygon({province_column})
-      `````
-
-  *  `cdb_geocode_admin1_polygon(admin1_name text, country_name text)`
-    * **Parameters**: 
-        * Name: `admin1_name` Type: `text` Description: Name of the province/state
-        * Name: `country_name` Type: `text` Description: Name of the country in which the province/state is located
-    * **Return type:** `polygon`
-    * **Usage example:**
-     
-     SELECT
-      `````
-      SELECT cdb_geocode_admin1_polygon('Alicante', 'Spain')
-      `````
-
-     UPDATE
-     `````
-     UPDATE {tablename} SET the_geom = cdb_geocode_admin1_polygon({province_column}, {country_column})
-     `````
-
-#### City geocoder
-The following functions provide a city geocoder service. It is recommended to use the more specific geocoding function -- the one that requires more parameters -- in order for the result to be as accurate as possible when several cities share their name.
-
-##### cdb_geocode_namedplace_point
-* Functions:
-  *  `cdb_geocode_namedplace_point(city_name text)`
-    * **Parameters**: 
-        * Name: `city_name` Type: `text` Description: Name of the city
-    * **Return type:** Geometry (point)
-    * **Usage example:**
-    
-      SELECT
-      `````
-      SELECT cdb_geocode_namedplace_point('Barcelona')
-      `````
-
-      UPDATE
-      `````
-      UPDATE {tablename} SET the_geom = cdb_geocode_namedplace_point({city_column})
-      `````
-
-  *  `cdb_geocode_namedplace_point(city_name text, country_name text)`
-    * **Parameters**: 
-        * Name: `city_name` Type: `text` Description: Name of the city
-        * Name: `country_name` Type: `text` Description: Name of the country in which the city is located
-    * **Return type:** Geometry (point)
-    * **Usage example:**
-    
-      SELECT
-      `````
-      SELECT cdb_geocode_namedplace_point('Barcelona', 'Spain')
-      `````
-
-      UPDATE
-      `````
-      UPDATE {tablename} SET the_geom = cdb_geocode_namedplace_point({city_column}, 'Spain')
-      `````
-      
-  *  `cdb_geocode_namedplace_point(city_name text, admin1_name text, country_name text)`
-    * **Parameters**: 
-        * Name: `city_name` Type: `text` Description: Name of the city
-        * Name: `admin1_name` Type: `text` Description: Name of the province/state in which the city is located
-        * Name: `country_name` Type: `text` Description: Name of the country in which the city is located
-    * **Return type:** Geometry (point)
-    * **Usage example:**
-      `````
-      SELECT cdb_geocode_namedplace_point('New York', 'New York', 'USA')
-      `````
-
-      UPDATE
-      `````
-      UPDATE {tablename} SET the_geom = cdb_geocode_namedplace_point({city_column}, {province_column}, 'Spain')
-      `````
-      
-
-#### Postal codes geocoder
-The following functions provide a postal code geocoding service that can be used to obtain points or polygon results. The postal code polygon geocoder covers the United States, France, Australia and Canada; a request for a different country will return an empty response.
-
-##### cdb_geocode_postalcode_polygon
-* Functions:
-  * `cdb_geocode_postalcode_polygon(postal_code text, country_name text)`
-    * **Parameters**: 
-        * Name: `postal_code` Type: `text` Description: Postal code
-        * Name: `country_name` Type: `text` Description: Name of the country in which the postal code is located
-    * **Return type:** Geometry (polygon)
-    * **Usage example:**
-        `````
-      SELECT cdb_geocode_postalcode_polygon('11211', 'USA')
-      `````
-
-      UPDATE
-      `````
-      UPDATE {tablename} SET the_geom = cdb_geocode_postalcode_polygon({postal_code_column}, 'Spain')
-      `````
-
-** Note: For the USA, US Census ZCTAs are considered.
-
-##### cdb_geocode_postalcode_point
-* Functions:
-  * `cdb_geocode_postalcode_point(code text, country_name text)`
-    * **Parameters**: 
-        * Name: `postal_code` Type: `text` Description: Postal code
-        * Name: `country_name` Type: `text` Description: Name of the country in which the postal code is located
-    * **Return type:** Geometry (point)
-    * **Usage example:**
-        `````
-      SELECT cdb_geocode_postalcode_point('11211', 'USA')
-      `````
-
-      UPDATE
-      `````
-      UPDATE {tablename} SET the_geom = cdb_geocode_postalcode_point({postal_code_column}, 'United States')
-      `````
-
-#### IP addresses Geocoder
-This function provides an IP address geocoding service, for both IPv4 and IPv6 addresses.
-
-##### cdb_geocode_ipaddress_point
-* Functions:
-  * `cdb_geocode_ipaddress_point(ip_address text)`
-    * **Parameters**: 
-        * Name: `ip_address` Type: `text` Description: IPv4 or IPv6 address
-    * **Return type:** Geometry (point)
-    * **Usage example:**
-        `````
-      SELECT cdb_geocode_ipaddress_point('102.23.34.1')
-      `````
-
-      UPDATE
-      `````
-      UPDATE {tablename} SET the_geom = cdb_geocode_ipaddress_point('102.23.34.1')
-      `````
-
-
-
-
-
-
+## Documentation

+* [Quickstart](quickstart.md)
+* [General concepts](general_concepts.md)
+* [Reference](reference.md)
--- a/doc/general_concepts.md
+++ b/doc/general_concepts.md
@@ -0,0 +1,33 @@
+# General concepts
+
+The Geocoder API offers geocoding services on top of the CartoDB SQL API by means of a set of geocoding functions. Each one of these functions is oriented to one kind of geocoding operation and it will return the corresponding geometry (a `polygon` or a `point`) according to the input information.
+
+The Geocoder API decouples the geocoding service from the CartoDB Editor, and allows to geocode data (being single rows, complete datasets or simple inputs) programatically through authenticated requests.
+
+The geometries provided by this API are projected in the projection [WGS 84 SRID 4326](http://spatialreference.org/ref/epsg/wgs-84/).
+
+The Geocoder API can return different types of geometries (points or polygons) as result of different geocoding processes. The CartoDB platform does not support multigeometry layers or datasets, therefore the final users of this Geocoder API must check that they are using consistent geometry types inside a table to avoid further conflicts in the map visualization.
+
+## Authentication
+
+All requests performed to the CartoDB Geocoder API must be authenticated with the user API Key. For more information about where to find your API Key, and how to authenticate your SQL API requests, view the [SQL API authentication](/cartodb-platform/sql-api/authentication/) guide.
+
+## Errors
+
+Errors are described in the response of the geocoder request. An example is as follows:
+
+```json
+{
+  error: [
+    "The api_key must be provided"
+  ]
+}
+```
+
+Since the Geocoder API is used on top of the CartoDB SQL API, you can refer to the [Making calls to the SQL API](/cartodb-platform/sql-api/making-calls/) documentation for help debugging your SQL errors.
+
+If the requested information is not in the CartoDB geocoding database, or if CartoDB is unable to recognize your input and match it with a result, the geocoding function returns `null` as a result.
+
+## Limits
+
+Usage of the Geocoder API is subject to the CartoDB SQL API limits, stated in our [Terms of Service](https://cartodb.com/terms/#excessive).
--- a/doc/quickstart.md
+++ b/doc/quickstart.md
@@ -0,0 +1,21 @@
+# Quickstart
+
+If you are using the set of APIs and libraries that CartoDB offers, and you are handling your data with the SQL API, you can make your data visible in your maps by geocoding the dataset programatically.
+
+Here is an example of how to geocode a single country:
+
+```bash
+https://{username}.cartodb.com/api/v2/sql?q=SELECT cdb_geocode_admin0_polygon('USA')&api_key={Your API key}
+```
+
+In order to geocode an existent CartoDB dataset, an SQL UPDATE statement must be used to populate the geometry column in the dataset with the results of the Geocoding API. For example, if the column where you are storing the country names for each one of our rows is called `country_column`, run the following statement in order to geocode the dataset:
+
+```bash
+https://{username}.cartodb.com/api/v2/sql?q=UPDATE {tablename} SET the_geom = cdb_geocode_admin0_polygon({country_column})&api_key={Your API key}
+```
+
+Notice that you can make use of Postgres or PostGIS functions in your Geocoder API requests, as the result of it will be a geometry that can be handled by the system. As an example, if you need to retrieve the centroid of a specific country, you can wrap the resulting geometry from the Geocoder API inside the PostGIS `ST_Centroid` function:
+
+```bash
+https://{username}.cartodb.com/api/v2/sql?q=SELECT ST_Centroid(cdb_geocode_admin0_polygon('USA'))&api_key={Your API key}
+```
--- a/doc/reference.md
+++ b/doc/reference.md
@@ -0,0 +1,269 @@
+# Geocoding functions
+
+The following geocoding functions are available, grouped by categories.
+
+
+## Country geocoder
+
+This function provides a country geocoding service. It recognizes the names of the different countries from different synonyms, such as their English name, their endonym, or their ISO2 or ISO3 codes.
+
+### cdb_geocode_admin0_polygon(_country_name text_)
+
+#### Arguments
+
+Name | Type | Description
+--- | --- | ---
+`country_name` | `text` | Name of the country
+
+#### Returns
+
+Geometry (polygon, EPSG 4326) or null
+
+#### Example
+
+##### Select
+
+```sql
+SELECT cdb_geocode_admin0_polygon('France')
+```
+
+##### Update
+
+```sql
+UPDATE {tablename} SET {the_geom} = cdb_geocode_admin0_polygon({country_column})
+```
+
+
+## Level-1 Administrative regions geocoder
+
+The following functions provide a geocoding service for administrative regions of level 1 (or NUTS-1) such as states for the United States, regions in France or autonomous communities in Spain.
+
+### cdb_geocode_admin1_polygon(_admin1_name text_)
+
+#### Arguments
+
+Name | Type | Description
+--- | --- | ---
+`admin1_name` | `text` | Name of the province/state
+
+#### Returns
+
+Geometry (polygon, EPSG 4326) or null
+
+#### Example
+
+##### Select
+
+```sql
+SELECT cdb_geocode_admin1_polygon('Alicante', 'Spain')
+```
+
+##### Update
+
+```sql
+UPDATE {tablename} SET the_geom = cdb_geocode_admin1_polygon({province_column}, {country_column})
+```
+
+### cdb_geocode_admin1_polygon(_admin1_name text, country_name text_)
+
+#### Arguments
+
+Name | Type | Description
+--- | --- | ---
+`admin1_name` | `text` | Name of the province/state
+`country_name` | `text` | Name of the country in which the province/state is located
+
+#### Returns
+
+Geometry (polygon, EPSG 4326) or null
+
+#### Example
+
+##### Select
+
+```sql
+SELECT cdb_geocode_admin1_polygon('Alicante', 'Spain')
+```
+
+##### Update
+
+```sql
+UPDATE {tablename} SET the_geom = cdb_geocode_admin1_polygon({province_column}, {country_column})
+```
+
+
+## City geocoder
+
+The following functions provide a city geocoder service. It is recommended to use the more specific geocoding function -- the one that requires more parameters — in order for the result to be as accurate as possible when several cities share their name.
+
+### cdb_geocode_namedplace_point(_city_name text_)
+
+#### Arguments
+
+Name | Type | Description
+--- | --- | ---
+`city_name` | `text` | Name of the city
+
+#### Returns
+
+Geometry (point, EPSG 4326) or null
+
+#### Example
+
+##### Select
+
+```sql
+SELECT cdb_geocode_namedplace_point('Barcelona')
+```
+
+##### Update
+
+```sql
+UPDATE {tablename} SET the_geom = cdb_geocode_namedplace_point({city_column})
+```
+
+### cdb_geocode_namedplace_point(_city_name text, country_name text_)
+
+#### Arguments
+
+Name | Type | Description
+--- | --- | ---
+`city_name` | `text` | Name of the city
+`country_name` | `text` | Name of the country in which the city is located
+
+#### Returns
+
+Geometry (point, EPSG 4326) or null
+
+#### Example
+
+##### Select
+
+```sql
+SELECT cdb_geocode_namedplace_point('Barcelona', 'Spain')
+```
+
+##### Update
+
+```sql
+UPDATE {tablename} SET the_geom = cdb_geocode_namedplace_point({city_column}, 'Spain')
+```
+
+### cdb_geocode_namedplace_point(_city_name text, admin1_name text, country_name text_)
+
+#### Arguments
+
+Name | Type | Description
+--- | --- | ---
+`city_name` | `text` | Name of the city
+`admin1_name` | `text` | Name of the province/state in which the city is located
+`country_name` | `text` | Name of the country in which the city is located
+
+#### Returns
+
+Geometry (point, EPSG 4326) or null
+
+#### Example
+
+##### Select
+
+```sql
+SELECT cdb_geocode_namedplace_point('New York', 'New York', 'USA')
+```
+
+##### Update
+
+```sql
+UPDATE {tablename} SET the_geom = cdb_geocode_namedplace_point({city_column}, {province_column}, 'Spain')
+```
+
+## Postal codes geocoder
+
+The following functions provide a postal code geocoding service that can be used to obtain points or polygon results. The postal code polygon geocoder covers the United States, France, Australia and Canada; a request for a different country will return an empty response.
+
+### cdb_geocode_postalcode_polygon(_postal_code text, country_name text_)
+
+#### Arguments
+
+Name | Type | Description
+--- | --- | ---
+`postal_code` | `text` | Postal code
+`country_name` | `text` | Name of the country in which the postal code is located
+
+#### Returns
+
+Geometry (polygon, EPSG 4326) or null
+
+#### Example
+
+##### Select
+
+```sql
+SELECT cdb_geocode_postalcode_polygon('11211', 'USA')
+```
+
+##### Update
+
+```sql
+UPDATE {tablename} SET the_geom = cdb_geocode_postalcode_polygon({postal_code_column}, 'Spain')
+```
+
+**Note:** For the USA, US Census ZCTAs are considered.
+
+### cdb_geocode_postalcode_point(_code text, country_name text_)
+
+#### Arguments
+
+Name | Type | Description
+--- | --- | ---
+`postal_code` | `text` | Postal code
+`country_name` | `text` | Name of the country in which the postal code is located
+
+#### Returns
+
+Geometry (point, EPSG 4326) or null
+
+#### Example
+
+##### Select
+
+```sql
+SELECT cdb_geocode_postalcode_point('11211', 'USA')
+```
+
+##### Update
+
+```sql
+UPDATE {tablename} SET the_geom = cdb_geocode_postalcode_point({postal_code_column}, 'United States')
+```
+
+## IP addresses Geocoder
+
+This function provides an IP address geocoding service, for both IPv4 and IPv6 addresses.
+
+### cdb_geocode_ipaddress_point(_ip_address text_)
+
+#### Arguments
+
+Name | Type | Description
+--- | --- | ---
+`ip_address` | `text` | Postal code
+`country_name` | `text` | IPv4 or IPv6 address
+
+#### Returns
+
+Geometry (point, EPSG 4326) or null
+
+#### Example
+
+##### Select
+
+```sql
+SELECT cdb_geocode_ipaddress_point('102.23.34.1')
+```
+
+##### Update
+
+```sql
+UPDATE {tablename} SET the_geom = cdb_geocode_ipaddress_point('102.23.34.1')
+```
--- a/interface.yaml
+++ b/interface.yaml
@@ -1,45 +1,33 @@
 ---
 - name: cdb_geocode_admin0_polygon
  return_type: Geometry
-  user_config_key: user_config
-  geocoder_config_key: geocoder_config
  params:
    - { name: country_name, type: text }

 - name: cdb_geocode_admin1_polygon
  return_type: Geometry
-  user_config_key: user_config
-  geocoder_config_key: geocoder_config
  params:
    - { name: admin1_name, type: text }

 - name: cdb_geocode_admin1_polygon
  return_type: Geometry
-  user_config_key: user_config
-  geocoder_config_key: geocoder_config
  params:
    - { name: admin1_name,  type: text }
    - { name: country_name, type: text }

 - name: cdb_geocode_namedplace_point
  return_type: Geometry
-  user_config_key: user_config
-  geocoder_config_key: geocoder_config
  params:
    - { name: city_name, type: text}

 - name: cdb_geocode_namedplace_point
  return_type: Geometry
-  user_config_key: user_config
-  geocoder_config_key: geocoder_config
  params:
    - { name: city_name,    type: text}
    - { name: country_name, type: text}

 - name: cdb_geocode_namedplace_point
  return_type: Geometry
-  user_config_key: user_config
-  geocoder_config_key: geocoder_config
  params:
    - { name: city_name,    type: text}
    - { name: admin1_name,  type: text}
@@ -48,24 +36,18 @@

 - name: cdb_geocode_postalcode_polygon
  return_type: Geometry
-  user_config_key: user_config
-  geocoder_config_key: geocoder_config
  params:
    - { name: postal_code,  type: text}
    - { name: country_name, type: text}

 - name: cdb_geocode_postalcode_point
  return_type: Geometry
-  user_config_key: user_config
-  geocoder_config_key: geocoder_config
  params:
    - { name: postal_code,  type: text}
    - { name: country_name, type: text}

 - name: cdb_geocode_ipaddress_point
  return_type: Geometry
-  user_config_key: user_config
-  geocoder_config_key: geocoder_config
  params:
    - { name: ip_address,  type: text}

--- a/server/extension/expected/30_admin0_test.out
+++ b/server/extension/expected/30_admin0_test.out
@@ -1,6 +1,6 @@
 -- Check that the public function is callable, even with no data
 -- It should return NULL
-SELECT cdb_geocoder_server.cdb_geocode_admin0_polygon(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 0, "nokia_soft_geocoder_limit": false}', 'Spain');
+SELECT cdb_geocoder_server.cdb_geocode_admin0_polygon('test_user', 'test_orgname', 'Spain');
 cdb_geocode_admin0_polygon 
 ----------------------------
 
@@ -16,7 +16,7 @@ INSERT INTO ne_admin0_v3 (adm0_a3, the_geom) VALUES('ESP', ST_GeomFromText(
            -71.1031880899493 42.3152774590236))',4326)
 );
 -- This should return the polygon inserted above
-SELECT cdb_geocoder_server.cdb_geocode_admin0_polygon(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 0, "nokia_soft_geocoder_limit": false}', 'Spain');
+SELECT cdb_geocoder_server.cdb_geocode_admin0_polygon('test_user', 'test_orgname', 'Spain');
                                                                     cdb_geocode_admin0_polygon                                                                     
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------
 0103000020E61000000100000004000000D0EA37A29AC651C00FD603035B284540FEFCFB379AC651C0C0503E9F5B284540FFDDDD4D96C651C033AC3B284F284540D0EA37A29AC651C00FD603035B284540
@@ -28,7 +28,7 @@ SELECT exists(SELECT *
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_admin0_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
 exists 
 --------
 t
--- a/server/extension/expected/40_admin1_test.out
+++ b/server/extension/expected/40_admin1_test.out
@@ -1,12 +1,12 @@
 -- Check that the public function is callable, even with no data
 -- It should return NULL
-SELECT cdb_geocoder_server.cdb_geocode_admin1_polygon(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'California');
+SELECT cdb_geocoder_server.cdb_geocode_admin1_polygon('test_user', 'test_orgname', 'California');
 cdb_geocode_admin1_polygon 
 ----------------------------
 
 (1 row)

-SELECT cdb_geocoder_server.cdb_geocode_admin1_polygon(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'California', 'United States');
+SELECT cdb_geocoder_server.cdb_geocode_admin1_polygon('test_user', 'test_orgname', 'California', 'United States');
 cdb_geocode_admin1_polygon 
 ----------------------------
 
@@ -22,13 +22,13 @@ INSERT INTO global_province_polygons (synonyms, iso3, the_geom) VALUES (Array['c
            -71.1031880899493 42.3152774590236))',4326)
 );
 -- This should return the polygon inserted above
-SELECT cdb_geocoder_server.cdb_geocode_admin1_polygon(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 0, "nokia_soft_geocoder_limit": false}', 'California');
+SELECT cdb_geocoder_server.cdb_geocode_admin1_polygon('test_user', 'test_orgname', 'California');
                                                                     cdb_geocode_admin1_polygon                                                                     
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------
 0103000020E61000000100000004000000D0EA37A29AC651C00FD603035B284540FEFCFB379AC651C0C0503E9F5B284540FFDDDD4D96C651C033AC3B284F284540D0EA37A29AC651C00FD603035B284540
 (1 row)

-SELECT cdb_geocoder_server.cdb_geocode_admin1_polygon(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 0, "nokia_soft_geocoder_limit": false}', 'California', 'United States');
+SELECT cdb_geocoder_server.cdb_geocode_admin1_polygon('test_user', 'test_orgname', 'California', 'United States');
                                                                     cdb_geocode_admin1_polygon                                                                     
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------
 0103000020E61000000100000004000000D0EA37A29AC651C00FD603035B284540FEFCFB379AC651C0C0503E9F5B284540FFDDDD4D96C651C033AC3B284F284540D0EA37A29AC651C00FD603035B284540
@@ -40,7 +40,7 @@ SELECT exists(SELECT *
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_admin1_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
 exists 
 --------
 t
@@ -51,7 +51,7 @@ SELECT exists(SELECT *
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_admin1_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
 exists 
 --------
 t
--- a/server/extension/expected/50_namedplaces_test.out
+++ b/server/extension/expected/50_namedplaces_test.out
@@ -1,18 +1,18 @@
 -- Check that the public function is callable, even with no data
 -- It should return NULL
-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elx');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elx');
 cdb_geocode_namedplace_point 
 ------------------------------
 
 (1 row)

-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elx', 'Spain');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elx', 'Spain');
 cdb_geocode_namedplace_point 
 ------------------------------
 
 (1 row)

-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elx', 'Valencia', 'Spain');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elx', 'Valencia', 'Spain');
 cdb_geocode_namedplace_point 
 ------------------------------
 
@@ -31,37 +31,37 @@ INSERT INTO country_decoder (synonyms, iso2) VALUES (Array['spain'], 'ES');
 -- Insert dummy data into admin1 decoder table
 INSERT INTO admin1_decoder (admin1, synonyms, iso2) VALUES ('Valencia', Array['valencia', 'Valencia'], 'ES');
 -- This should return the point inserted above
-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elx');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elx');
            cdb_geocode_namedplace_point            
 ----------------------------------------------------
 0101000020E6100000637FD93D7958E63F2ECA6C9049A24340
 (1 row)

-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elche');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elche');
            cdb_geocode_namedplace_point            
 ----------------------------------------------------
 0101000020E6100000637FD93D7958E63F2ECA6C9049A24340
 (1 row)

-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elx', 'Spain');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elx', 'Spain');
            cdb_geocode_namedplace_point            
 ----------------------------------------------------
 0101000020E6100000637FD93D7958E63F2ECA6C9049A24340
 (1 row)

-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elche', 'Spain');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elche', 'Spain');
            cdb_geocode_namedplace_point            
 ----------------------------------------------------
 0101000020E6100000637FD93D7958E63F2ECA6C9049A24340
 (1 row)

-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elx', 'Valencia', 'Spain');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elx', 'Valencia', 'Spain');
            cdb_geocode_namedplace_point            
 ----------------------------------------------------
 0101000020E6100000637FD93D7958E63F2ECA6C9049A24340
 (1 row)

-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elche', 'valencia', 'Spain');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elche', 'valencia', 'Spain');
            cdb_geocode_namedplace_point            
 ----------------------------------------------------
 0101000020E6100000637FD93D7958E63F2ECA6C9049A24340
@@ -73,7 +73,7 @@ SELECT exists(SELECT *
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_namedplace_point'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
 exists 
 --------
 t
@@ -84,7 +84,7 @@ SELECT exists(SELECT *
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_namedplace_point'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
 exists 
 --------
 t
@@ -95,7 +95,7 @@ SELECT exists(SELECT *
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_namedplace_point'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
 exists 
 --------
 t
--- a/server/extension/expected/60_postalcodes_test.out
+++ b/server/extension/expected/60_postalcodes_test.out
@@ -6,7 +6,7 @@ DELETE FROM available_services;
 DELETE FROM admin0_synonyms;
 -- Check that the public function is callable, even with no data
 -- It should return NULL
-SELECT cdb_geocoder_server.cdb_geocode_postalcode_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '03204');
+SELECT cdb_geocoder_server.cdb_geocode_postalcode_point('test_user', 'test_org', '03204');
 cdb_geocode_postalcode_point 
 ------------------------------
 
@@ -42,25 +42,25 @@ INSERT INTO admin0_synonyms (adm0_a3, name, name_, rank) VALUES (
  3
 );
 -- This should return the polygon inserted above
-SELECT cdb_geocoder_server.cdb_geocode_postalcode_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '03204');
+SELECT cdb_geocoder_server.cdb_geocode_postalcode_point('test_user', 'test_org', '03204');
            cdb_geocode_postalcode_point            
 ----------------------------------------------------
 0101000020E61000000000000000E040408036B47414764840
 (1 row)

-SELECT cdb_geocoder_server.cdb_geocode_postalcode_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '03204', 'spain');
+SELECT cdb_geocoder_server.cdb_geocode_postalcode_point('test_user', 'test_org', '03204', 'spain');
            cdb_geocode_postalcode_point            
 ----------------------------------------------------
 0101000020E61000000000000000E040408036B47414764840
 (1 row)

-SELECT cdb_geocoder_server.cdb_geocode_postalcode_polygon(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '03204');
+SELECT cdb_geocoder_server.cdb_geocode_postalcode_polygon('test_user', 'test_org', '03204');
                                                                            cdb_geocode_postalcode_polygon                                                                            
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 0106000020E610000001000000010300000001000000040000000000000000E000C01F383D7839B740400000000000E000C0AA3C0EDE220F3B4000000000004812404FB7FCCD04893D400000000000E000C01F383D7839B74040
 (1 row)

-SELECT cdb_geocoder_server.cdb_geocode_postalcode_polygon(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '03204', 'spain');
+SELECT cdb_geocoder_server.cdb_geocode_postalcode_polygon('test_user', 'test_org', '03204', 'spain');
                                                                            cdb_geocode_postalcode_polygon                                                                            
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 0106000020E610000001000000010300000001000000040000000000000000E000C01F383D7839B740400000000000E000C0AA3C0EDE220F3B4000000000004812404FB7FCCD04893D400000000000E000C01F383D7839B74040
@@ -78,7 +78,7 @@ SELECT exists(SELECT *
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_postalcode_point'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
 exists 
 --------
 t
@@ -89,7 +89,7 @@ SELECT exists(SELECT *
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_postalcode_point'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
 exists 
 --------
 t
@@ -100,7 +100,7 @@ SELECT exists(SELECT *
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_postalcode_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
 exists 
 --------
 t
@@ -111,7 +111,7 @@ SELECT exists(SELECT *
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_postalcode_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');
 exists 
 --------
 t
--- a/server/extension/expected/70_ips_test.out
+++ b/server/extension/expected/70_ips_test.out
@@ -1,6 +1,6 @@
 -- Check that the public function is callable, even with no data
 -- It should return NULL
-SELECT cdb_geocoder_server.cdb_geocode_ipaddress_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '0.0.0.0');
+SELECT cdb_geocoder_server.cdb_geocode_ipaddress_point('test_user', 'test_orgname', '0.0.0.0');
 cdb_geocode_ipaddress_point 
 -----------------------------
 
@@ -9,7 +9,7 @@ SELECT cdb_geocoder_server.cdb_geocode_ipaddress_point(session_user, '{"is_organ
 -- Insert dummy data into ip_address_locations
 INSERT INTO ip_address_locations VALUES ('::ffff:0.0.0.0'::inet, (ST_SetSRID(ST_MakePoint('40.40', '3.71'), 4326)));
 -- This should return the polygon inserted above
-SELECT cdb_geocoder_server.cdb_geocode_ipaddress_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '0.0.0.0');
+SELECT cdb_geocoder_server.cdb_geocode_ipaddress_point('test_user', 'test_orgname', '0.0.0.0');
            cdb_geocode_ipaddress_point             
 ----------------------------------------------------
 0101000020E61000003333333333334440AE47E17A14AE0D40
@@ -21,7 +21,7 @@ SELECT exists(SELECT *
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_ipaddress_point'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');
 exists 
 --------
 t
--- a/server/extension/expected/90_remove_geocoder_api_user_test.out
+++ b/server/extension/expected/90_remove_geocoder_api_user_test.out
@@ -0,0 +1,5 @@
+REVOKE EXECUTE ON ALL FUNCTIONS IN SCHEMA cdb_geocoder_server FROM geocoder_api;
+REVOKE EXECUTE ON ALL FUNCTIONS IN SCHEMA public FROM geocoder_api;
+REVOKE USAGE ON SCHEMA cdb_geocoder_server FROM geocoder_api;
+REVOKE USAGE ON SCHEMA public FROM geocoder_api;
+REVOKE SELECT ON ALL TABLES IN SCHEMA public FROM geocoder_api;
--- a/server/extension/sql/0.0.1/30_admin0.sql
+++ b/server/extension/sql/0.0.1/30_admin0.sql
@@ -1,9 +1,9 @@
 -- Interface of the server extension

-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin0_polygon(user_id name, user_config_data JSON, geocoder_config_data JSON, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin0_polygon(username text, orgname text, country_name text)
 RETURNS Geometry AS $$
    plpy.debug('Entering cdb_geocode_admin0_polygons')
-    plpy.debug('user_id = %s' % user_id)
+    plpy.debug('user = %s' % username)

    #--TODO: rate limiting check
    #--TODO: quota check
--- a/server/extension/sql/0.0.1/40_admin1.sql
+++ b/server/extension/sql/0.0.1/40_admin1.sql
@@ -1,10 +1,10 @@
 -- Interfacess of the server extension

 ---- cdb_geocode_admin1_polygon(admin1_name text)
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin1_polygon(user_id name, user_config json, geocoder_config json, admin1_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin1_polygon(username text, orgname text, admin1_name text)
 RETURNS Geometry AS $$
    plpy.debug('Entering cdb_geocode_admin1_polygon(admin1_name text)')
-    plpy.debug('user_id = %s' % user_id)
+    plpy.debug('user = %s' % username)

    #--TODO: rate limiting check
    #--TODO: quota check
@@ -18,10 +18,10 @@ RETURNS Geometry AS $$
 $$ LANGUAGE plpythonu;

 ---- cdb_geocode_admin1_polygon(admin1_name text, country_name text)
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin1_polygon(user_id name, user_config json, geocoder_config json, admin1_name text, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_admin1_polygon(username text, orgname text, admin1_name text, country_name text)
 RETURNS Geometry AS $$
    plpy.debug('Entering cdb_geocode_admin1_polygon(admin1_name text, country_name text)')
-    plpy.debug('user_id = %s' % user_id)
+    plpy.debug('user = %s' % username)

    #--TODO: rate limiting check
    #--TODO: quota check
--- a/server/extension/sql/0.0.1/50_namedplaces.sql
+++ b/server/extension/sql/0.0.1/50_namedplaces.sql
@@ -1,10 +1,10 @@
 -- Interfacess of the server extension

 ---- cdb_geocode_namedplace_point(city_name text)
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_namedplace_point(user_id name, user_config json, geocoder_config json, city_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text)
 RETURNS Geometry AS $$
    plpy.debug('Entering cdb_geocode_namedplace_point(city_name text)')
-    plpy.debug('user_id = %s' % user_id)
+    plpy.debug('user = %s' % username)

    #--TODO: rate limiting check
    #--TODO: quota check
@@ -18,10 +18,10 @@ RETURNS Geometry AS $$
 $$ LANGUAGE plpythonu;

 ---- cdb_geocode_namedplace_point(city_name text, country_name text)
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_namedplace_point(user_id name, user_config json, geocoder_config json, city_name text, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text, country_name text)
 RETURNS Geometry AS $$
    plpy.debug('Entering cdb_geocode_namedplace_point(city_name text, country_name text)')
-    plpy.debug('user_id = %s' % user_id)
+    plpy.debug('user = %s' % username)

    #--TODO: rate limiting check
    #--TODO: quota check
@@ -35,10 +35,10 @@ RETURNS Geometry AS $$
 $$ LANGUAGE plpythonu;

 ---- cdb_geocode_namedplace_point(city_name text, admin1_name text, country_name text)
-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_namedplace_point(user_id name, user_config json, geocoder_config json, city_name text, admin1_name text, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_namedplace_point(username text, orgname text, city_name text, admin1_name text, country_name text)
 RETURNS Geometry AS $$
    plpy.debug('Entering cdb_geocode_namedplace_point(city_name text, admin1_name text, country_name text)')
-    plpy.debug('user_id = %s' % user_id)
+    plpy.debug('user = %s' % username)

    #--TODO: rate limiting check
    #--TODO: quota check
--- a/server/extension/sql/0.0.1/60_postalcodes.sql
+++ b/server/extension/sql/0.0.1/60_postalcodes.sql
@@ -1,9 +1,9 @@
 -- Interface of the server extension

-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_postalcode_point(user_id name, user_config json, geocoder_config json, code text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_postalcode_point(username text, orgname text, code text)
 RETURNS Geometry AS $$
    plpy.debug('Entering _cdb_geocode_postalcode_point')
-    plpy.debug('user_id = %s' % user_id)
+    plpy.debug('user = %s' % username)

    #--TODO: rate limiting check
    #--TODO: quota check
@@ -16,10 +16,10 @@ RETURNS Geometry AS $$
    return rv[0]["point"]
 $$ LANGUAGE plpythonu;

-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_postalcode_point(user_id name, user_config json, geocoder_config json, code text, country text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_postalcode_point(username text, orgname text, code text, country text)
 RETURNS Geometry AS $$
    plpy.debug('Entering _cdb_geocode_postalcode_point')
-    plpy.debug('user_id = %s' % user_id)
+    plpy.debug('user = %s' % username)

    #--TODO: rate limiting check
    #--TODO: quota check
@@ -32,10 +32,10 @@ RETURNS Geometry AS $$
    return rv[0]["point"]
 $$ LANGUAGE plpythonu;

-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_postalcode_polygon(user_id name, user_config json, geocoder_config json, code text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_postalcode_polygon(username text, orgname text, code text)
 RETURNS Geometry AS $$
    plpy.debug('Entering _cdb_geocode_postalcode_polygon')
-    plpy.debug('user_id = %s' % user_id)
+    plpy.debug('user = %s' % username)

    #--TODO: rate limiting check
    #--TODO: quota check
@@ -48,10 +48,10 @@ RETURNS Geometry AS $$
    return rv[0]["polygon"]
 $$ LANGUAGE plpythonu;

-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_postalcode_polygon(user_id name, user_config json, geocoder_config json, code text, country text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_postalcode_polygon(username text, orgname text, code text, country text)
 RETURNS Geometry AS $$
    plpy.debug('Entering _cdb_geocode_postalcode_point')
-    plpy.debug('user_id = %s' % user_id)
+    plpy.debug('user = %s' % username)

    #--TODO: rate limiting check
    #--TODO: quota check
--- a/server/extension/sql/0.0.1/70_ips.sql
+++ b/server/extension/sql/0.0.1/70_ips.sql
@@ -1,9 +1,9 @@
 -- Interface of the server extension

-CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_ipaddress_point(user_id name, user_config json, geocoder_config json, ip text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.cdb_geocode_ipaddress_point(username text, orgname text, ip text)
 RETURNS Geometry AS $$
    plpy.debug('Entering _cdb_geocode_ipaddress_point')
-    plpy.debug('user_id = %s' % user_id)
+    plpy.debug('user = %s' % username)

    #--TODO: rate limiting check
    #--TODO: quota check
--- a/server/extension/sql/0.0.1/90_geocoder_server_user.sql
+++ b/server/extension/sql/0.0.1/90_geocoder_server_user.sql
@@ -0,0 +1,15 @@
+DO $$
+BEGIN
+    IF NOT EXISTS (
+        SELECT *
+        FROM   pg_catalog.pg_user
+        WHERE  usename = 'geocoder_api') THEN
+
+            CREATE USER geocoder_api;
+    END IF;
+    GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA cdb_geocoder_server TO geocoder_api;
+    GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA public TO geocoder_api;
+    GRANT USAGE ON SCHEMA cdb_geocoder_server TO geocoder_api;
+    GRANT USAGE ON SCHEMA public TO geocoder_api;
+    GRANT SELECT ON ALL TABLES IN SCHEMA public TO geocoder_api;
+END$$;
--- a/server/extension/sql/30_admin0_test.sql
+++ b/server/extension/sql/30_admin0_test.sql
@@ -1,6 +1,6 @@
 -- Check that the public function is callable, even with no data
 -- It should return NULL
-SELECT cdb_geocoder_server.cdb_geocode_admin0_polygon(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 0, "nokia_soft_geocoder_limit": false}', 'Spain');
+SELECT cdb_geocoder_server.cdb_geocode_admin0_polygon('test_user', 'test_orgname', 'Spain');

 -- Insert some dummy synonym
 INSERT INTO admin0_synonyms (name, adm0_a3) VALUES ('Spain', 'ESP');
@@ -14,7 +14,7 @@ INSERT INTO ne_admin0_v3 (adm0_a3, the_geom) VALUES('ESP', ST_GeomFromText(
 );

 -- This should return the polygon inserted above
-SELECT cdb_geocoder_server.cdb_geocode_admin0_polygon(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 0, "nokia_soft_geocoder_limit": false}', 'Spain');
+SELECT cdb_geocoder_server.cdb_geocode_admin0_polygon('test_user', 'test_orgname', 'Spain');

 -- Check for admin0 signatures
 SELECT exists(SELECT *
@@ -22,7 +22,7 @@ SELECT exists(SELECT *
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_admin0_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');

 SELECT exists(SELECT *
              FROM pg_proc p
--- a/server/extension/sql/40_admin1_test.sql
+++ b/server/extension/sql/40_admin1_test.sql
@@ -1,7 +1,7 @@
 -- Check that the public function is callable, even with no data
 -- It should return NULL
-SELECT cdb_geocoder_server.cdb_geocode_admin1_polygon(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'California');
-SELECT cdb_geocoder_server.cdb_geocode_admin1_polygon(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'California', 'United States');
+SELECT cdb_geocoder_server.cdb_geocode_admin1_polygon('test_user', 'test_orgname', 'California');
+SELECT cdb_geocoder_server.cdb_geocode_admin1_polygon('test_user', 'test_orgname', 'California', 'United States');

 -- Insert dummy data into country decoder table
 INSERT INTO country_decoder (synonyms, iso3) VALUES (Array['united states'], 'USA');
@@ -15,8 +15,8 @@ INSERT INTO global_province_polygons (synonyms, iso3, the_geom) VALUES (Array['c
 );

 -- This should return the polygon inserted above
-SELECT cdb_geocoder_server.cdb_geocode_admin1_polygon(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 0, "nokia_soft_geocoder_limit": false}', 'California');
-SELECT cdb_geocoder_server.cdb_geocode_admin1_polygon(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 0, "nokia_soft_geocoder_limit": false}', 'California', 'United States');
+SELECT cdb_geocoder_server.cdb_geocode_admin1_polygon('test_user', 'test_orgname', 'California');
+SELECT cdb_geocoder_server.cdb_geocode_admin1_polygon('test_user', 'test_orgname', 'California', 'United States');

 -- Check for admin1 signatures
 SELECT exists(SELECT *
@@ -24,14 +24,14 @@ SELECT exists(SELECT *
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_admin1_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');

 SELECT exists(SELECT *
              FROM pg_proc p
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_admin1_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');

 SELECT exists(SELECT *
              FROM pg_proc p
--- a/server/extension/sql/50_namedplaces_test.sql
+++ b/server/extension/sql/50_namedplaces_test.sql
@@ -1,8 +1,8 @@
 -- Check that the public function is callable, even with no data
 -- It should return NULL
-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elx');
-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elx', 'Spain');
-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elx', 'Valencia', 'Spain');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elx');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elx', 'Spain');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elx', 'Valencia', 'Spain');

 -- Insert dummy data into points table
 INSERT INTO global_cities_points_limited (geoname_id, name, iso2, admin1, admin2, population, lowername, the_geom) VALUES (3128760, 'Elche', 'ES', 'Valencia', 'AL', 34534, 'elche', ST_GeomFromText(
@@ -21,12 +21,12 @@ INSERT INTO country_decoder (synonyms, iso2) VALUES (Array['spain'], 'ES');
 INSERT INTO admin1_decoder (admin1, synonyms, iso2) VALUES ('Valencia', Array['valencia', 'Valencia'], 'ES');

 -- This should return the point inserted above
-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elx');
-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elche');
-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elx', 'Spain');
-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elche', 'Spain');
-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elx', 'Valencia', 'Spain');
-SELECT cdb_geocoder_server.cdb_geocode_namedplace_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', 'Elche', 'valencia', 'Spain');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elx');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elche');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elx', 'Spain');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elche', 'Spain');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elx', 'Valencia', 'Spain');
+SELECT cdb_geocoder_server.cdb_geocode_namedplace_point('test_user', 'test_orgname', 'Elche', 'valencia', 'Spain');

 -- Check for namedplaces signatures
 SELECT exists(SELECT *
@@ -34,21 +34,21 @@ SELECT exists(SELECT *
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_namedplace_point'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');

 SELECT exists(SELECT *
              FROM pg_proc p
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_namedplace_point'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');

 SELECT exists(SELECT *
              FROM pg_proc p
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_namedplace_point'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');

 SELECT exists(SELECT *
              FROM pg_proc p
--- a/server/extension/sql/60_postalcodes_test.sql
+++ b/server/extension/sql/60_postalcodes_test.sql
@@ -7,7 +7,7 @@ DELETE FROM admin0_synonyms;

 -- Check that the public function is callable, even with no data
 -- It should return NULL
-SELECT cdb_geocoder_server.cdb_geocode_postalcode_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '03204');
+SELECT cdb_geocoder_server.cdb_geocode_postalcode_point('test_user', 'test_org', '03204');

 -- Insert dummy data into ip_address_locations
 INSERT INTO global_postal_code_points (the_geom, iso3, postal_code, postal_code_num) VALUES (
@@ -44,13 +44,13 @@ INSERT INTO admin0_synonyms (adm0_a3, name, name_, rank) VALUES (
 );

 -- This should return the polygon inserted above
-SELECT cdb_geocoder_server.cdb_geocode_postalcode_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '03204');
+SELECT cdb_geocoder_server.cdb_geocode_postalcode_point('test_user', 'test_org', '03204');

-SELECT cdb_geocoder_server.cdb_geocode_postalcode_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '03204', 'spain');
+SELECT cdb_geocoder_server.cdb_geocode_postalcode_point('test_user', 'test_org', '03204', 'spain');

-SELECT cdb_geocoder_server.cdb_geocode_postalcode_polygon(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '03204');
+SELECT cdb_geocoder_server.cdb_geocode_postalcode_polygon('test_user', 'test_org', '03204');

-SELECT cdb_geocoder_server.cdb_geocode_postalcode_polygon(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '03204', 'spain');
+SELECT cdb_geocoder_server.cdb_geocode_postalcode_polygon('test_user', 'test_org', '03204', 'spain');

 -- Clean dbs
 DELETE FROM global_postal_code_points;
@@ -65,28 +65,28 @@ SELECT exists(SELECT *
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_postalcode_point'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');

 SELECT exists(SELECT *
              FROM pg_proc p
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_postalcode_point'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');

 SELECT exists(SELECT *
              FROM pg_proc p
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_postalcode_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');

 SELECT exists(SELECT *
              FROM pg_proc p
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_postalcode_polygon'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text, text');

 SELECT exists(SELECT *
              FROM pg_proc p
--- a/server/extension/sql/70_ips_test.sql
+++ b/server/extension/sql/70_ips_test.sql
@@ -1,12 +1,12 @@
 -- Check that the public function is callable, even with no data
 -- It should return NULL
-SELECT cdb_geocoder_server.cdb_geocode_ipaddress_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '0.0.0.0');
+SELECT cdb_geocoder_server.cdb_geocode_ipaddress_point('test_user', 'test_orgname', '0.0.0.0');

 -- Insert dummy data into ip_address_locations
 INSERT INTO ip_address_locations VALUES ('::ffff:0.0.0.0'::inet, (ST_SetSRID(ST_MakePoint('40.40', '3.71'), 4326)));

 -- This should return the polygon inserted above
-SELECT cdb_geocoder_server.cdb_geocode_ipaddress_point(session_user, '{"is_organization": false, "entity_name": "test_user"}', '{"street_geocoder_provider": "nokia","nokia_monthly_quota": 100, "nokia_soft_geocoder_limit": false}', '0.0.0.0');
+SELECT cdb_geocoder_server.cdb_geocode_ipaddress_point('test_user', 'test_orgname', '0.0.0.0');

 -- Check for namedplaces signatures (point and polygon)
 SELECT exists(SELECT *
@@ -14,7 +14,7 @@ SELECT exists(SELECT *
              INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
              WHERE ns.nspname = 'cdb_geocoder_server'
              AND proname = 'cdb_geocode_ipaddress_point'
-              AND oidvectortypes(p.proargtypes)  = 'name, json, json, text');
+              AND oidvectortypes(p.proargtypes)  = 'text, text, text');

 SELECT exists(SELECT *
              FROM pg_proc p
--- a/server/extension/sql/90_remove_geocoder_api_user_test.sql
+++ b/server/extension/sql/90_remove_geocoder_api_user_test.sql
@@ -0,0 +1,5 @@
+REVOKE EXECUTE ON ALL FUNCTIONS IN SCHEMA cdb_geocoder_server FROM geocoder_api;
+REVOKE EXECUTE ON ALL FUNCTIONS IN SCHEMA public FROM geocoder_api;
+REVOKE USAGE ON SCHEMA cdb_geocoder_server FROM geocoder_api;
+REVOKE USAGE ON SCHEMA public FROM geocoder_api;
+REVOKE SELECT ON ALL TABLES IN SCHEMA public FROM geocoder_api;
--- a/test/README.md
+++ b/test/README.md
@@ -0,0 +1,20 @@
+# Geocoder API integration tests
+This are the automatic integration tests for geocoder api (both client and server)
+
+### Usage
+In order to execute the tests you have to execute the `run_tests` python script:
+
+``` python run_tests.py [--host=cartodb.com] username api_key```
+
+You can define the host where is going to execute the SQL API queries to test the
+geocoder API. By default the value is `cartodb.com` but you can put the host you need.
+
+### Tests
+
+This suite of tests test the following parts of the geocoding API through the SQL API:
+
+- Admin 0 functions
+- Admin 1 functions
+- Named places functions
+- Postal code functions
+- Ip address functions
--- a/test/init.py
+++ b/test/init.py
--- a/test/fixtures/geocoder_api_test_dataset.csv
+++ b/test/fixtures/geocoder_api_test_dataset.csv
@@ -0,0 +1,3 @@
+id,country,province,city,postalcode,ip
+1,Spain,Castilla y León,Valladolid,47010,8.8.8.8
+2,USA,New York,Manhattn,10001,8.8.8.8
--- a/test/helpers/init.py
+++ b/test/helpers/init.py
--- a/test/helpers/import_helper.py
+++ b/test/helpers/import_helper.py
@@ -0,0 +1,59 @@
+import os
+import requests
+import json
+
+import time
+
+
+class ImportHelper:
+
+    @classmethod
+    def import_test_dataset(cls, username, api_key, host):
+        requests.packages.urllib3.disable_warnings()
+        url = "https://{0}.{1}/api/v1/imports/"\
+            "?type_guessing=false&privacy=public&api_key={2}".format(
+            username, host, api_key)
+        dataset = {
+            'file': open('fixtures/geocoder_api_test_dataset.csv', 'rb')}
+        response = requests.post(url, files=dataset)
+        response_json = json.loads(response.text)
+        if not response_json['success']:
+            print "Error importing the test dataset: {0}".format(response.text)
+            sys.exit(1)
+        while(True):
+            table_name = ImportHelper.get_imported_table_name(
+                username,
+                host,
+                api_key,
+                response_json['item_queue_id']
+            )
+            if table_name:
+                return table_name
+            else:
+                time.sleep(5)
+
+    @classmethod
+    def get_imported_table_name(cls, username, host, api_key, import_id):
+        requests.packages.urllib3.disable_warnings()
+        import_url = "https://{0}.{1}/api/v1/imports/{2}?api_key={3}".format(
+            username, host, import_id, api_key)
+        import_data_response = requests.get(import_url)
+        if import_data_response.status_code != 200:
+            print "Error getting the table name from " \
+                "the import data: {0}".format(
+                import_data_response.text)
+            sys.exit(1)
+        import_data_json = json.loads(import_data_response.text)
+
+        return import_data_json['table_name']
+
+    @classmethod
+    def clean_test_dataset(cls, username, api_key, table_name, host):
+        requests.packages.urllib3.disable_warnings()
+        url = "https://{0}.{1}/api/v2/sql?q=drop table {2}&api_key={3}".format(
+            username, host, table_name, api_key
+        )
+        response = requests.get(url)
+        if response.status_code != 200:
+            print "Error cleaning the test dataset: {0}".format(response.text)
+            sys.exit(1)
--- a/test/helpers/integration_test_helper.py
+++ b/test/helpers/integration_test_helper.py
@@ -0,0 +1,32 @@
+import os
+import requests
+import json
+
+
+class IntegrationTestHelper:
+
+    @classmethod
+    def get_environment_variables(cls):
+        username = os.environ["GEOCODER_API_TEST_USERNAME"]
+        api_key = os.environ["GEOCODER_API_TEST_API_KEY"]
+        host = os.environ["GEOCODER_API_TEST_HOST"]
+        table_name = os.environ["GEOCODER_API_TEST_TABLE_NAME"]
+
+        return {
+            "username": username,
+            "api_key": api_key,
+            "host": host,
+            "table_name": table_name
+        }
+
+    @classmethod
+    def execute_query(cls, sql_api_url, query):
+        requests.packages.urllib3.disable_warnings()
+        query_url = "{0}?q={1}".format(sql_api_url, query)
+        print "Executing query: {0}".format(query_url)
+        query_response = requests.get(query_url)
+        if query_response.status_code != 200:
+            raise Exception(json.loads(query_response.text)['error'])
+        query_response_data = json.loads(query_response.text)
+
+        return query_response_data['rows'][0]['geometry']
--- a/test/integration/init.py
+++ b/test/integration/init.py
--- a/test/integration/test_admin0_functions.py
+++ b/test/integration/test_admin0_functions.py
@@ -0,0 +1,32 @@
+from unittest import TestCase
+from nose.tools import assert_raises
+from nose.tools import assert_not_equal, assert_equal
+from ..helpers.integration_test_helper import IntegrationTestHelper
+
+
+class TestAdmin0Functions(TestCase):
+
+    def setUp(self):
+        self.env_variables = IntegrationTestHelper.get_environment_variables()
+        self.sql_api_url = "https://{0}.{1}/api/v2/sql".format(
+            self.env_variables['username'],
+            self.env_variables['host'],
+            self.env_variables['api_key']
+        )
+
+    def test_if_select_with_admin0_is_ok(self):
+        query = "SELECT cdb_geocode_admin0_polygon(country) as geometry " \
+            "FROM {0} LIMIT 1&api_key={1}".format(
+            self.env_variables['table_name'],
+            self.env_variables['api_key'])
+        geometry = IntegrationTestHelper.execute_query(self.sql_api_url, query)
+        assert_not_equal(geometry, None)
+
+    def test_if_select_with_admin0_without_api_key_raise_error(self):
+        query = "SELECT cdb_geocode_admin0_polygon(country) as geometry " \
+            "FROM {0} LIMIT 1".format(
+            self.env_variables['table_name'])
+        try:
+            IntegrationTestHelper.execute_query(self.sql_api_url, query)
+        except Exception as e:
+            assert_equal(e.message[0], "The api_key must be provided")
--- a/test/integration/test_admin1_functions.py
+++ b/test/integration/test_admin1_functions.py
@@ -0,0 +1,40 @@
+from unittest import TestCase
+from nose.tools import assert_raises
+from nose.tools import assert_not_equal, assert_equal
+from ..helpers.integration_test_helper import IntegrationTestHelper
+
+
+class TestAdmin1Functions(TestCase):
+
+    def setUp(self):
+        self.env_variables = IntegrationTestHelper.get_environment_variables()
+        self.sql_api_url = "https://{0}.{1}/api/v2/sql".format(
+            self.env_variables['username'],
+            self.env_variables['host'],
+            self.env_variables['api_key']
+        )
+
+    def test_if_select_with_admin1_without_country_is_ok(self):
+        query = "SELECT cdb_geocode_admin1_polygon(province) as geometry " \
+            "FROM {0} LIMIT 1&api_key={1}".format(
+            self.env_variables['table_name'],
+            self.env_variables['api_key'])
+        geometry = IntegrationTestHelper.execute_query(self.sql_api_url, query)
+        assert_not_equal(geometry, None)
+
+    def test_if_select_with_admin1_with_country_is_ok(self):
+        query = "SELECT cdb_geocode_admin1_polygon(province,country)" \
+            "as geometry FROM {0} LIMIT 1&api_key={1}".format(
+            self.env_variables['table_name'],
+            self.env_variables['api_key'])
+        geometry = IntegrationTestHelper.execute_query(self.sql_api_url, query)
+        assert_not_equal(geometry, None)
+
+    def test_if_select_with_admin1_without_api_key_raise_error(self):
+        query = "SELECT cdb_geocode_admin1_polygon(province) as geometry " \
+            "FROM {0} LIMIT 1".format(
+            self.env_variables['table_name'])
+        try:
+            IntegrationTestHelper.execute_query(self.sql_api_url, query)
+        except Exception as e:
+            assert_equal(e.message[0], "The api_key must be provided")
--- a/test/integration/test_ipaddress_functions.py
+++ b/test/integration/test_ipaddress_functions.py
@@ -0,0 +1,32 @@
+from unittest import TestCase
+from nose.tools import assert_raises
+from nose.tools import assert_not_equal, assert_equal
+from ..helpers.integration_test_helper import IntegrationTestHelper
+
+
+class TestPostalcodeFunctions(TestCase):
+
+    def setUp(self):
+        self.env_variables = IntegrationTestHelper.get_environment_variables()
+        self.sql_api_url = "https://{0}.{1}/api/v2/sql".format(
+            self.env_variables['username'],
+            self.env_variables['host'],
+            self.env_variables['api_key']
+        )
+
+    def test_if_select_with_ipaddress_point_is_ok(self):
+        query = "SELECT cdb_geocode_ipaddress_point(ip) " \
+            "as geometry FROM {0} LIMIT 1&api_key={1}".format(
+            self.env_variables['table_name'],
+            self.env_variables['api_key'])
+        geometry = IntegrationTestHelper.execute_query(self.sql_api_url, query)
+        assert_not_equal(geometry, None)
+
+    def test_if_select_with_ipaddress_without_api_key_raise_error(self):
+        query = "SELECT cdb_geocode_ipaddress_point(ip) " \
+            "as geometry FROM {0} LIMIT 1".format(
+            self.env_variables['table_name'])
+        try:
+            IntegrationTestHelper.execute_query(self.sql_api_url, query)
+        except Exception as e:
+            assert_equal(e.message[0], "The api_key must be provided")
--- a/test/integration/test_namedplace_functions.py
+++ b/test/integration/test_namedplace_functions.py
@@ -0,0 +1,48 @@
+from unittest import TestCase
+from nose.tools import assert_raises
+from nose.tools import assert_not_equal, assert_equal
+from ..helpers.integration_test_helper import IntegrationTestHelper
+
+
+class TestNameplaceFunctions(TestCase):
+
+    def setUp(self):
+        self.env_variables = IntegrationTestHelper.get_environment_variables()
+        self.sql_api_url = "https://{0}.{1}/api/v2/sql".format(
+            self.env_variables['username'],
+            self.env_variables['host'],
+            self.env_variables['api_key']
+        )
+
+    def test_if_select_with_namedplace_city_is_ok(self):
+        query = "SELECT cdb_geocode_namedplace_point(city) as geometry " \
+            "FROM {0} LIMIT 1&api_key={1}".format(
+            self.env_variables['table_name'],
+            self.env_variables['api_key'])
+        geometry = IntegrationTestHelper.execute_query(self.sql_api_url, query)
+        assert_not_equal(geometry, None)
+
+    def test_if_select_with_namedplace_city_country_is_ok(self):
+        query = "SELECT cdb_geocode_namedplace_point(city,country) " \
+            "as geometry FROM {0} LIMIT 1&api_key={1}".format(
+            self.env_variables['table_name'],
+            self.env_variables['api_key'])
+        geometry = IntegrationTestHelper.execute_query(self.sql_api_url, query)
+        assert_not_equal(geometry, None)
+
+    def test_if_select_with_namedplace_city_province_country_is_ok(self):
+        query = "SELECT cdb_geocode_namedplace_point(city,province,country) " \
+            "as geometry FROM {0} LIMIT 1&api_key={1}".format(
+            self.env_variables['table_name'],
+            self.env_variables['api_key'])
+        geometry = IntegrationTestHelper.execute_query(self.sql_api_url, query)
+        assert_not_equal(geometry, None)
+
+    def test_if_select_with_namedplace_without_api_key_raise_error(self):
+        query = "SELECT cdb_geocode_namedplace_point(city) as geometry " \
+            "FROM {0} LIMIT 1".format(
+            self.env_variables['table_name'])
+        try:
+            IntegrationTestHelper.execute_query(self.sql_api_url, query)
+        except Exception as e:
+            assert_equal(e.message[0], "The api_key must be provided")
--- a/test/integration/test_postalcode_functions.py
+++ b/test/integration/test_postalcode_functions.py
@@ -0,0 +1,40 @@
+from unittest import TestCase
+from nose.tools import assert_raises
+from nose.tools import assert_not_equal, assert_equal
+from ..helpers.integration_test_helper import IntegrationTestHelper
+
+
+class TestPostalcodeFunctions(TestCase):
+
+    def setUp(self):
+        self.env_variables = IntegrationTestHelper.get_environment_variables()
+        self.sql_api_url = "https://{0}.{1}/api/v2/sql".format(
+            self.env_variables['username'],
+            self.env_variables['host'],
+            self.env_variables['api_key']
+        )
+
+    def test_if_select_with_postalcode_polygon_is_ok(self):
+        query = "SELECT cdb_geocode_postalcode_polygon(postalcode, country) " \
+            "as geometry FROM {0} WHERE country='USA'&api_key={1}".format(
+            self.env_variables['table_name'],
+            self.env_variables['api_key'])
+        geometry = IntegrationTestHelper.execute_query(self.sql_api_url, query)
+        assert_not_equal(geometry, None)
+
+    def test_if_select_with_postalcode_point_is_ok(self):
+        query = "SELECT cdb_geocode_postalcode_point(postalcode, country) " \
+            "as geometry FROM {0} WHERE country='Spain'&api_key={1}".format(
+            self.env_variables['table_name'],
+            self.env_variables['api_key'])
+        geometry = IntegrationTestHelper.execute_query(self.sql_api_url, query)
+        assert_not_equal(geometry, None)
+
+    def test_if_select_with_postalcode_without_api_key_raise_error(self):
+        query = "SELECT cdb_geocode_postalcode_polygon(postalcode, country) " \
+            "as geometry FROM {0} WHERE country = 'USA'".format(
+            self.env_variables['table_name'])
+        try:
+            IntegrationTestHelper.execute_query(self.sql_api_url, query)
+        except Exception as e:
+            assert_equal(e.message[0], "The api_key must be provided")
--- a/test/run_tests.py
+++ b/test/run_tests.py
@@ -0,0 +1,76 @@
+import getopt
+import sys
+import time
+import subprocess
+import os
+import re
+from helpers.import_helper import ImportHelper
+
+
+def main():
+    opts, args = getopt.getopt(sys.argv[1:], "h", ["help", "host="])
+
+    if len(args) < 2:
+        usage()
+        sys.exit()
+
+    host = "cartodb.com"
+    username = args[0]
+    api_key = args[1]
+    table_name = "geocoder_api_test_dataset_".format(int(time.time()))
+    for o, a in opts:
+        if o in ("-h", "--help"):
+            usage()
+            sys.exit()
+        elif o in ("--host"):
+            host = opts[0][1]
+        else:
+            assert False, "unhandled option"
+
+    try:
+        table_name = ImportHelper.import_test_dataset(username, api_key, host)
+        set_environment_variables(username, api_key, table_name, host)
+        execute_tests()
+    except Exception as e:
+        print e.message
+        sys.exit(1)
+    finally:
+        clean_environment_variables()
+        ImportHelper.clean_test_dataset(username, api_key, table_name, host)
+
+
+def usage():
+    print """Usage: run_tests.py [options] username api_key
+        Options:
+        -h: Show this help
+        --host: take that host as base (by default is cartodb.com)"""
+
+
+def execute_tests():
+    process = subprocess.Popen(
+        ["nosetests", "--where=integration/"],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE
+    )
+    out, err = process.communicate()
+    print err
+    regexp = re.compile(r'FAILED \(.*\)')
+    if regexp.search(err) is not None:
+        sys.exit(1)
+
+
+def set_environment_variables(username, api_key, table_name, host):
+    os.environ["GEOCODER_API_TEST_USERNAME"] = username
+    os.environ["GEOCODER_API_TEST_API_KEY"] = api_key
+    os.environ["GEOCODER_API_TEST_TABLE_NAME"] = table_name
+    os.environ["GEOCODER_API_TEST_HOST"] = host
+
+
+def clean_environment_variables():
+    del os.environ["GEOCODER_API_TEST_USERNAME"]
+    del os.environ["GEOCODER_API_TEST_API_KEY"]
+    del os.environ["GEOCODER_API_TEST_TABLE_NAME"]
+    del os.environ["GEOCODER_API_TEST_HOST"]
+
+if __name__ == "__main__":
+    main()
Author	SHA1	Message	Date
Mario de Frutos	61ad671fbd	Update README.md	2015-12-23 16:00:51 +01:00
Rafa de la Torre	91b3a98e58	Add LICENSE file	2015-12-22 18:13:46 +01:00
Mario de Frutos	6ee84d676b	Merge pull request #59 from CartoDB/integration_test_readme README for integration tests	2015-12-09 14:37:43 +01:00
Mario de Frutos	df29f9f5c9	README for integration tests	2015-12-09 14:12:48 +01:00
Carlos Matallín	c524c5c960	Merge pull request #58 from CartoDB/502-geocoding geocoding docs	2015-12-09 13:25:23 +01:00
Mario de Frutos	2b1b9cd729	In order to pass all the tests we need to make the import public	2015-12-09 13:24:16 +01:00
Carla	a03d3f9541	edits error example	2015-12-09 13:23:59 +01:00
Carlos Matallín	bf8db3e41d	Merge branch '502-geocoding' of github.com:CartoDB/geocoder-api into 502-geocoding	2015-12-09 13:20:54 +01:00
Carlos Matallín	0f4ff59a52	Merge branch 'master' into 502-geocoding	2015-12-09 13:20:28 +01:00
Mario de Frutos	298a893ec5	Check for a properly exit if the tests failed	2015-12-09 13:13:24 +01:00
Mario de Frutos	bdde91b660	Disable ssl warnings for requests and refactor the dataset cleaner	2015-12-09 12:11:50 +01:00
Mario de Frutos	7fd69b3205	Deleted not needed prints	2015-12-09 12:04:10 +01:00
Rafa de la Torre	c4dca9c713	Merge pull request #57 from CartoDB/integration_test_automation First iteration to automate smoke tests	2015-12-07 10:51:28 +01:00
Mario de Frutos	ae65aff707	Refactor and extract import logic to a helper	2015-12-06 15:01:46 +01:00
Mario de Frutos	342066f22a	Ip address functions integration tests	2015-12-06 14:54:41 +01:00
Mario de Frutos	3fd603d5cb	Postal codes functions integration tests	2015-12-06 14:54:24 +01:00
Mario de Frutos	07041922a4	Namedplaces functions integration tests	2015-12-06 14:54:12 +01:00
Mario de Frutos	db10d5b29a	Admin1 integration tests	2015-12-06 14:53:54 +01:00
Mario de Frutos	26174dda22	Fixture to fulfill the tests needs	2015-12-06 14:53:37 +01:00
Mario de Frutos	4ca82f01a8	Deactivated field guessing to avoid convert postal code to integer	2015-12-06 14:52:57 +01:00
Mario de Frutos	916b353ffe	Finished admin0 tests	2015-12-06 13:30:15 +01:00
Mario de Frutos	f552f2db12	Created helper to be used in all the tests	2015-12-06 13:10:54 +01:00
Mario de Frutos	1397b3fcaf	First iteration to automate smoke tests	2015-12-04 16:58:28 +01:00
Carla	296ded26d5	Make explicit the projection	2015-12-04 14:49:41 +01:00
Mario de Frutos	d0ebd003de	Merge pull request #56 from CartoDB/change_to_username_instead_of_json_config Change to username instead of json config	2015-12-03 15:14:00 +01:00
Carla	85e95e1e60	Update reference.md	2015-12-03 11:24:45 +01:00
Mario de Frutos	922c531313	Added orgname to the arguments we pass to the server	2015-12-03 11:03:10 +01:00
Carla	4cf104e80c	Fix format	2015-12-03 11:01:41 +01:00
Carlos Matallín	2ff102361d	split files	2015-12-02 19:47:28 +01:00
Carlos Matallín	7fc6f7e173	split files	2015-12-02 19:41:52 +01:00
Carlos Matallín	0288858d5a	split files	2015-12-02 19:36:05 +01:00
Carlos Matallín	c6358924f4	split files	2015-12-02 19:12:55 +01:00
Mario de Frutos	57c5b3ac19	Check for empty username	2015-12-02 19:12:11 +01:00
Mario de Frutos	941e7084e6	Change functions to user username and remove JSON config passed as argument	2015-12-02 18:54:49 +01:00
Mario de Frutos	ba7b8cfa7d	Function to get the username based user type (org or non-org)	2015-12-02 18:54:27 +01:00
Mario de Frutos	ef7c915420	Merge pull request #54 from CartoDB/add_geocoder_server_user Create and give permissions to the server user	2015-12-01 17:36:11 +01:00
Mario de Frutos	082d876c8d	Create and give permissions to the server user	2015-12-01 17:23:32 +01:00