Fixing conflicts

This commit is contained in:
Carla Iriberri
2015-11-17 12:35:07 +01:00
6 changed files with 19 additions and 45 deletions
+6
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