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

Fixing conflicts

Browse Source
This commit is contained in:
Carla Iriberri
2015-11-17 12:35:07 +01:00
parent c7b6db3560 b977277052
commit 6d7156e309
6 changed files with 19 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/expected/00_installation_test.out
View File

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

6
client/expected/90_permissions_test.out
View File

@@ -80,6 +80,7 @@ CONTEXT: SQL statement "SELECT cdb_geocoder_client._geocode_ipaddress_point(ses
PL/pgSQL function cdb_geocoder_client.geocode_ipaddress_point(text) line 5 at SQL statement
geocode_ipaddress_point
-------------------------
(1 row)
@@ -100,8 +101,13 @@ SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, '66666'
ERROR: permission denied for function _geocode_postalcode_polygon
SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', 666, '66666', 'Hell');
ERROR: permission denied for function _geocode_postalcode_point
<<<<<<< HEAD
SELECT cdb_geocoder_client._geocode_ipaddress_point('evil_user', 666, '8.8.8.8');
ERROR: permission denied for function _geocode_ipaddress_point
-- Check the regular user cannot look into config table
SELECT * from cdb_geocoder_client._config;
ERROR: permission denied for relation _config
=======
SELECT cdb_geocoder_client._geocode_ip('evil_user', 666, '8.8.8.8');
ERROR: permission denied for function _geocode_ip
>>>>>>> b977277052c9bf387b2f28a4720a071a08e8e821