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

Fix merge conflict

Browse Source
This commit is contained in:
Rafa de la Torre 2015-11-17 11:37:50 +00:00
parent 6d7156e309
commit 0163700414
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/expected/90_permissions_test.out
View File

@ -81,7 +81,6 @@ PL/pgSQL function cdb_geocoder_client.geocode_ipaddress_point(text) line 5 at SQ
geocode_ipaddress_point geocode_ipaddress_point
------------------------- -------------------------
(1 row) (1 row)
-- Check the regular user has no permissions on private functions -- Check the regular user has no permissions on private functions
@ -101,13 +100,5 @@ SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, '66666'
ERROR: permission denied for function _geocode_postalcode_polygon ERROR: permission denied for function _geocode_postalcode_polygon
SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', 666, '66666', 'Hell'); SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', 666, '66666', 'Hell');
ERROR: permission denied for function _geocode_postalcode_point ERROR: permission denied for function _geocode_postalcode_point
<<<<<<< HEAD
SELECT cdb_geocoder_client._geocode_ipaddress_point('evil_user', 666, '8.8.8.8'); SELECT cdb_geocoder_client._geocode_ipaddress_point('evil_user', 666, '8.8.8.8');
ERROR: permission denied for function _geocode_ipaddress_point 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

3
client/sql/90_permissions_test.sql
View File

@ -23,6 +23,3 @@ SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol',
SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, '66666', 'Hell'); SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, '66666', 'Hell');
SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', 666, '66666', 'Hell'); SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', 666, '66666', 'Hell');
SELECT cdb_geocoder_client._geocode_ipaddress_point('evil_user', 666, '8.8.8.8'); SELECT cdb_geocoder_client._geocode_ipaddress_point('evil_user', 666, '8.8.8.8');
-- Check the regular user cannot look into config table
SELECT * from cdb_geocoder_client._config;