From 93f003a6729d02c28f82fe96ed28363bb5bcf116 Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Fri, 12 Feb 2016 12:55:12 +0100 Subject: [PATCH] Fixed error in the imports for the version 0.3.0 --- server/extension/cdb_dataservices_server--0.2.0--0.3.0.sql | 2 +- server/extension/cdb_dataservices_server--0.3.0.sql | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/extension/cdb_dataservices_server--0.2.0--0.3.0.sql b/server/extension/cdb_dataservices_server--0.2.0--0.3.0.sql index f58217c..ce17bc0 100644 --- a/server/extension/cdb_dataservices_server--0.2.0--0.3.0.sql +++ b/server/extension/cdb_dataservices_server--0.2.0--0.3.0.sql @@ -337,4 +337,4 @@ RETURNS Geometry AS $$ plpy.error(error_msg) finally: quota_service.increment_total_geocoder_use() -$$ LANGUAGE plpythonu; +$$ LANGUAGE plpythonu; \ No newline at end of file diff --git a/server/extension/cdb_dataservices_server--0.3.0.sql b/server/extension/cdb_dataservices_server--0.3.0.sql index 85119c8..c34e8a4 100644 --- a/server/extension/cdb_dataservices_server--0.3.0.sql +++ b/server/extension/cdb_dataservices_server--0.3.0.sql @@ -66,7 +66,7 @@ RETURNS boolean AS $$ return False else: import json - from cartodb_services.quota import GeocoderConfig + from cartodb_services.metrics import GeocoderConfig plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username)) redis_conn = GD["redis_connection_{0}".format(username)]['redis_metadata_connection'] heremaps_conf_json = plpy.execute("SELECT cartodb.CDB_Conf_GetConf('heremaps_conf') as heremaps_conf", 1)[0]['heremaps_conf'] @@ -105,7 +105,7 @@ $$ LANGUAGE plpythonu; CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_here_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL) RETURNS Geometry AS $$ from cartodb_services.here import HereMapsGeocoder - from cartodb_services.quota import QuotaService + from cartodb_services.metrics import QuotaService redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection'] user_geocoder_config = GD["user_geocoder_config_{0}".format(username)] @@ -140,7 +140,7 @@ $$ LANGUAGE plpythonu; CREATE OR REPLACE FUNCTION cdb_dataservices_server._cdb_google_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL) RETURNS Geometry AS $$ from cartodb_services.google import GoogleMapsGeocoder - from cartodb_services.quota import QuotaService + from cartodb_services.metrics import QuotaService redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection'] user_geocoder_config = GD["user_geocoder_config_{0}".format(username)]