If the error message happens to be empty, it will break serailization. (

#4622)
getredash · Feb 9, 2020 · c961c33 · c961c33
1 parent 5afc94c
commit c961c33
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/redash/serializers/__init__.py b/redash/serializers/__init__.py
@@ -284,6 +284,7 @@ def serialize_job(job):
         updated_at = 0
 
     status = STATUSES[job_status]
+    query_result_id = None
 
     if isinstance(job.result, Exception):
         error = str(job.result)
@@ -292,13 +293,14 @@ def serialize_job(job):
         error = "Query execution cancelled."
     else:
         error = ""
+        query_result_id = job.result
 
     return {
         "job": {
             "id": job.id,
             "updated_at": updated_at,
             "status": status,
             "error": error,
-            "query_result_id": job.result if job.is_finished and not error else None,
+            "query_result_id": query_result_id,
         }
     }