Fix uses of cartodb cdb_conf functions
This commit is contained in:
@@ -32,7 +32,7 @@ class RateLimitsConfigLegacyBuilder(object):
|
|||||||
rate_limit = json.loads(rate_limit_json)
|
rate_limit = json.loads(rate_limit_json)
|
||||||
else:
|
else:
|
||||||
conf_key = 'rate_limits'
|
conf_key = 'rate_limits'
|
||||||
sql = "SELECT cartodb.CDB_Conf_GetConf('{0}') as conf".format(conf_key)
|
sql = "SELECT cdb_dataservices_server.CDB_Conf_GetConf('{0}') as conf".format(conf_key)
|
||||||
try:
|
try:
|
||||||
conf = self._db_conn.execute(sql, 1)[0]['conf']
|
conf = self._db_conn.execute(sql, 1)[0]['conf']
|
||||||
except Exception:
|
except Exception:
|
||||||
|
|||||||
@@ -551,7 +551,7 @@ class ServicesDBConfig:
|
|||||||
|
|
||||||
def _get_conf(self, key):
|
def _get_conf(self, key):
|
||||||
try:
|
try:
|
||||||
sql = "SELECT cartodb.CDB_Conf_GetConf('{0}') as conf".format(key)
|
sql = "SELECT cdb_dataservices_server.CDB_Conf_GetConf('{0}') as conf".format(key)
|
||||||
conf = self._db_conn.execute(sql, 1)
|
conf = self._db_conn.execute(sql, 1)
|
||||||
return conf[0]['conf']
|
return conf[0]['conf']
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
@@ -185,7 +185,7 @@ class LoggerConfig:
|
|||||||
|
|
||||||
def _get_conf(self, key):
|
def _get_conf(self, key):
|
||||||
try:
|
try:
|
||||||
sql = "SELECT cartodb.CDB_Conf_GetConf('{0}') as conf".format(key)
|
sql = "SELECT cdb_dataservices_server.CDB_Conf_GetConf('{0}') as conf".format(key)
|
||||||
conf = self._db_conn.execute(sql, 1)
|
conf = self._db_conn.execute(sql, 1)
|
||||||
return conf[0]['conf']
|
return conf[0]['conf']
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ class RedisDBConfig:
|
|||||||
return self._build(key)
|
return self._build(key)
|
||||||
|
|
||||||
def _build(self, key):
|
def _build(self, key):
|
||||||
conf_query = "SELECT cartodb.CDB_Conf_GetConf('{0}') as conf".format(
|
conf_query = "SELECT cdb_dataservices_server.CDB_Conf_GetConf('{0}') as conf".format(
|
||||||
key)
|
key)
|
||||||
conf = self._db_conn.execute(conf_query)[0]['conf']
|
conf = self._db_conn.execute(conf_query)[0]['conf']
|
||||||
if conf is None:
|
if conf is None:
|
||||||
|
|||||||
Reference in New Issue
Block a user