valitydev/redash
14
0
Fork 0
mirror of https://github.com/valitydev/redash.git synced 2024-11-09 02:06:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix basic query execution from UI

Browse Source
This commit is contained in:
Allen Short 2016-12-07 17:57:21 -06:00
parent da31d983b7
commit 4ba399af67
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
redash/tasks/queries.py
View File

@ -332,8 +332,8 @@ def cleanup_query_results():
unused_query_results = models.QueryResult.unused(settings.QUERY_RESULTS_CLEANUP_MAX_AGE).limit(settings.QUERY_RESULTS_CLEANUP_COUNT)
total_unused_query_results = models.QueryResult.unused().count()
deleted_count = models.QueryResult.delete().where(models.QueryResult.id << unused_query_results).execute()
deleted_count = unused_query_results.delete()
models.db.session.commit()
logger.info("Deleted %d unused query results out of total of %d." % (deleted_count, total_unused_query_results))
@ -385,7 +385,7 @@ class QueryExecutor(object):
self.metadata = metadata
self.data_source = self._load_data_source()
if user_id is not None:
self.user = models.User.get_by_id(user_id)
self.user = models.User.query.get(user_id)
else:
self.user = None
self.query_hash = gen_query_hash(self.query)
@ -424,16 +424,17 @@ class QueryExecutor(object):
self.tracker.update(state='failed')
result = QueryExecutionError(error)
else:
query_result, updated_query_ids = models.QueryResult.store_result(self.data_source.org_id, self.data_source.id,
self.query_hash, self.query, data,
run_time, utils.utcnow())
query_result, updated_query_ids = models.QueryResult.store_result(
self.data_source.org, self.data_source,
self.query_hash, self.query, data,
run_time, utils.utcnow())
self._log_progress('checking_alerts')
for query_id in updated_query_ids:
check_alerts_for_query.delay(query_id)
self._log_progress('finished')
result = query_result.id
models.db.session.commit()
return result
def _annotate_query(self, query_runner):
@ -457,7 +458,7 @@ class QueryExecutor(object):
def _load_data_source(self):
logger.info("task=execute_query state=load_ds ds_id=%d", self.data_source_id)
return models.DataSource.get_by_id(self.data_source_id)
return models.DataSource.query.get(self.data_source_id)
# user_id is added last as a keyword argument for backward compatability -- to support executing previously submitted