From 55337efc3ae57e8a27ed12fd76cc186cbff5b048 Mon Sep 17 00:00:00 2001
From: Mario de Frutos <mario.defrutos@cartodb.com>
Date: Wed, 11 Nov 2015 16:54:19 +0100
Subject: [PATCH] Added schema to server functions and fixed some errors

---
 server/extension/sql/0.0.1/10_helper.sql         | 2 +-
 server/extension/sql/0.0.1/20_geocode_street.sql | 4 ++--
 server/extension/sql/0.0.1/30_admin0.sql         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/extension/sql/0.0.1/10_helper.sql b/server/extension/sql/0.0.1/10_helper.sql
index 5247057..12415ff 100644
--- a/server/extension/sql/0.0.1/10_helper.sql
+++ b/server/extension/sql/0.0.1/10_helper.sql
@@ -1,5 +1,5 @@
 -- Get values_json for provided key from conf table
-CREATE OR REPLACE FUNCTION _get_conf(_key TEXT)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server._get_conf(_key TEXT)
   RETURNS text
 AS $$
 DECLARE
diff --git a/server/extension/sql/0.0.1/20_geocode_street.sql b/server/extension/sql/0.0.1/20_geocode_street.sql
index 6f17067..4bb7ebb 100644
--- a/server/extension/sql/0.0.1/20_geocode_street.sql
+++ b/server/extension/sql/0.0.1/20_geocode_street.sql
@@ -1,5 +1,5 @@
 -- Geocodes a street address given a searchtext and a state and/or country
-CREATE OR REPLACE FUNCTION geocode_street(searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_street(searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
   RETURNS Geometry
 AS $$
   import json
@@ -19,4 +19,4 @@ AS $$
   point = plpy.execute(plan, [coordinates[0], coordinates[1]], 1)[0]
 
   return point['st_setsrid']
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE plpythonu;
\ No newline at end of file
diff --git a/server/extension/sql/0.0.1/30_admin0.sql b/server/extension/sql/0.0.1/30_admin0.sql
index 1c43db2..c5e4ed6 100644
--- a/server/extension/sql/0.0.1/30_admin0.sql
+++ b/server/extension/sql/0.0.1/30_admin0.sql
@@ -1,6 +1,6 @@
 -- Interface of the server extension
 
-CREATE OR REPLACE FUNCTION geocode_admin0_polygons(user_id name, tx_id bigint, country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server.geocode_admin0_polygons(user_id name, tx_id bigint, country_name text)
 RETURNS Geometry AS $$
     plpy.debug('Entering geocode_admin0_polygons')
     plpy.debug('user_id = %s' % user_id)
@@ -26,7 +26,7 @@ $$ LANGUAGE plpythonu;
 
 -- Implementation of the server extension
 -- Note: these functions depend on the cdb_geocoder extension
-CREATE OR REPLACE FUNCTION _geocode_admin0_polygons(country_name text)
+CREATE OR REPLACE FUNCTION cdb_geocoder_server._geocode_admin0_polygons(country_name text)
 RETURNS Geometry AS $$
   DECLARE
     ret Geometry;