[explore] fix empty query message in 'View Query' (#4273)

This commit is contained in:
Maxime Beauchemin 2018-01-24 13:14:38 -08:00 committed by GitHub
parent 77d1e5d046
commit b90c410c01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions

View File

@ -988,16 +988,22 @@ class Superset(BaseSupersetView):
return redirect(endpoint)
def get_query_string_response(self, viz_obj):
query = None
try:
query_obj = viz_obj.query_obj()
query = viz_obj.datasource.get_query_str(query_obj)
if query_obj:
query = viz_obj.datasource.get_query_str(query_obj)
except Exception as e:
logging.exception(e)
return json_error_response(e)
if query_obj['prequeries']:
if query_obj and query_obj['prequeries']:
query_obj['prequeries'].append(query)
query = ';\n\n'.join(query_obj['prequeries'])
query += ';'
if query:
query += ';'
else:
query = 'No query.'
return Response(
json.dumps({
@ -1099,9 +1105,10 @@ class Superset(BaseSupersetView):
force = request.args.get('force') == 'true'
form_data = self.get_form_data()
except Exception as e:
return json_error_response(
utils.error_msg_from_exception(e),
stacktrace=traceback.format_exc())
logging.exception(e)
return json_error_response(
utils.error_msg_from_exception(e),
stacktrace=traceback.format_exc())
return self.generate_json(datasource_type=datasource_type,
datasource_id=datasource_id,
form_data=form_data,