From e28aa9a3a2a619db552b2607c9a0ba94b2405387 Mon Sep 17 00:00:00 2001
From: Mario de Frutos <mario.defrutos@cartodb.com>
Date: Tue, 17 Nov 2015 10:39:22 +0100
Subject: [PATCH] Removed the _conf table functions and change to use
 cartodb.cdb_conf

---
 server/extension/sql/0.0.1/10_config.sql      | 38 -------------------
 ...1_redis_helper.sql => 10_redis_helper.sql} |  2 +-
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 server/extension/sql/0.0.1/10_config.sql
 rename server/extension/sql/0.0.1/{11_redis_helper.sql => 10_redis_helper.sql} (94%)

diff --git a/server/extension/sql/0.0.1/10_config.sql b/server/extension/sql/0.0.1/10_config.sql
deleted file mode 100644
index 15d271b..0000000
--- a/server/extension/sql/0.0.1/10_config.sql
+++ /dev/null
@@ -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/geocoder.
-
-CREATE TABLE IF NOT EXISTS cdb_geocoder_server._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_server._config', '');
-
-
-CREATE OR REPLACE FUNCTION cdb_geocoder_server._config_set(key text, value JSON)
-RETURNS VOID AS $$
-BEGIN
-    PERFORM cdb_geocoder_server._config_remove(key);
-    EXECUTE 'INSERT INTO cdb_geocoder_server._config (KEY, VALUE) VALUES ($1, $2);' USING key, value;
-END
-$$ LANGUAGE PLPGSQL VOLATILE;
-
-
-CREATE OR REPLACE FUNCTION cdb_geocoder_server._config_remove(key text)
-RETURNS VOID AS $$
-BEGIN
-    EXECUTE 'DELETE FROM cdb_geocoder_server._config WHERE KEY = $1;' USING key;
-END
-$$ LANGUAGE PLPGSQL VOLATILE;
-
-CREATE OR REPLACE FUNCTION cdb_geocoder_server._config_get(key text)
-    RETURNS JSON AS $$
-DECLARE
-    value JSON;
-BEGIN
-    EXECUTE 'SELECT VALUE FROM cdb_geocoder_server._config WHERE KEY = $1;' INTO value USING key;
-    RETURN value;
-END
-$$ LANGUAGE PLPGSQL STABLE;
diff --git a/server/extension/sql/0.0.1/11_redis_helper.sql b/server/extension/sql/0.0.1/10_redis_helper.sql
similarity index 94%
rename from server/extension/sql/0.0.1/11_redis_helper.sql
rename to server/extension/sql/0.0.1/10_redis_helper.sql
index e6dda61..b39e720 100644
--- a/server/extension/sql/0.0.1/11_redis_helper.sql
+++ b/server/extension/sql/0.0.1/10_redis_helper.sql
@@ -9,7 +9,7 @@ CREATE TYPE cdb_geocoder_server._redis_conf_params AS (
 -- Get the Redis configuration from the _conf table --
 CREATE OR REPLACE FUNCTION cdb_geocoder_server._get_redis_conf()
 RETURNS cdb_geocoder_server._redis_conf_params AS $$
-    conf = plpy.execute("SELECT cdb_geocoder_server._config_get('redis_conf') conf")[0]['conf']
+    conf = plpy.execute("SELECT cartodb.CDB_Conf_GetConf('redis_conf') conf")[0]['conf']
     if conf is None:
       plpy.error("There is no redis configuration defined")
     else: