Fixing conflicts

client/cdb_geocoder_client.control

@@ -1,6 +1,6 @@
 # CartoDB geocoder client API extension
 comment = 'CartoDB geocoder client API extension'
 default_version = '0.0.1'
-requires = 'plproxy'
+requires = 'plproxy, cartodb'
 superuser = true
 schema = cdb_geocoder_client

client/expected/00_installation_test.out

@@ -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"}');
+SELECT cartodb.cdb_conf_setconf('geocoder_server_config', '{"connection_str": "dbname=contrib_regression host=127.0.0.1 user=postgres"}');
- _config_set 
+ cdb_conf_setconf 
--------------
+------------------
  
 (1 row)
 

client/expected/90_permissions_test.out

@@ -81,6 +81,7 @@ PL/pgSQL function cdb_geocoder_client.geocode_ipaddress_point(text) line 5 at SQ
  geocode_ipaddress_point 
 -------------------------
 
+ 
 (1 row)
 
 -- Check the regular user has no permissions on private functions
@@ -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

client/sql/0.0.1/05_geocoder_server_conf.sql

@@ -1,38 +0,0 @@
---
--- This extension has its own table for configurations.
---
--- The table and the function are considered to be private and therefore
--- no permissions are granted for any other user but the creator.
-
-CREATE TABLE IF NOT EXISTS cdb_geocoder_client._config ( KEY TEXT PRIMARY KEY, VALUE JSON NOT NULL );
-
--- Needed to dump config in backups
--- This can only be called from an SQL script executed by CREATE EXTENSION
-SELECT pg_catalog.pg_extension_config_dump('cdb_geocoder_client._config', '');
-
-
-CREATE OR REPLACE FUNCTION cdb_geocoder_client._config_set(key text, value JSON)
-RETURNS VOID AS $$
-BEGIN
-    PERFORM cdb_geocoder_client._config_remove(key);
-    EXECUTE 'INSERT INTO cdb_geocoder_client._config (KEY, VALUE) VALUES ($1, $2);' USING key, value;
-END
-$$ LANGUAGE PLPGSQL VOLATILE;
-
-
-CREATE OR REPLACE FUNCTION cdb_geocoder_client._config_remove(key text)
-RETURNS VOID AS $$
-BEGIN
-    EXECUTE 'DELETE FROM cdb_geocoder_client._config WHERE KEY = $1;' USING key;
-END
-$$ LANGUAGE PLPGSQL VOLATILE;
-
-CREATE OR REPLACE FUNCTION cdb_geocoder_client._config_get(key text)
-    RETURNS JSON AS $$
-DECLARE
-    value JSON;
-BEGIN
-    EXECUTE 'SELECT VALUE FROM cdb_geocoder_client._config WHERE KEY = $1;' INTO value USING key;
-    RETURN value;
-END
-$$ LANGUAGE PLPGSQL STABLE;

client/sql/0.0.1/06_geocoder_server_conn.sql

@@ -9,7 +9,7 @@ RETURNS text AS $$
 DECLARE
   db_connection_str text;
 BEGIN
-  SELECT cdb_geocoder_client._config_get('db_server_config')->'connection_str' INTO db_connection_str;
+  SELECT cartodb.cdb_conf_getconf('geocoder_server_config')->'connection_str' INTO db_connection_str;
   SELECT trim(both '"' FROM db_connection_str) INTO db_connection_str;
   RETURN db_connection_str;
 END;

client/sql/00_installation_test.sql

@@ -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"}');
+SELECT cartodb.cdb_conf_setconf('geocoder_server_config', '{"connection_str": "dbname=contrib_regression host=127.0.0.1 user=postgres"}');
 
 -- Mock the server schema
 CREATE SCHEMA cdb_geocoder_server;