query_runner -> query_results: improve logging, handle unhandled data types

redash/query_runner/athena.py

@@ -153,7 +153,9 @@ def type(cls):
         return "athena"
 
     def _get_iam_credentials(self, user=None):
-        if ASSUME_ROLE:
+        # Use the default credentials if iam_role is not provided
+        # 20 is the default botocore ParamValidation: Invalid length for parameter RoleArn, value: 0, valid min length: 20
+        if ASSUME_ROLE and len(self.configuration.get("iam_role")) >= 20:
             role_session_name = "redash" if user is None else user.email
             sts = boto3.client("sts")
             creds = sts.assume_role(

redash/query_runner/query_results.py

@@ -109,9 +109,13 @@ def flatten(value):
         return json_dumps(value)
     elif isinstance(value, decimal.Decimal):
         return float(value)
-    elif isinstance(value, datetime.timedelta):
+    elif isinstance(value, (datetime.date, datetime.time, datetime.datetime, datetime.timedelta)):
         return str(value)
+    elif value is None:
+        return 'NULL'
     else:
+        if not isinstance(value, (str, float, int)):
+            logger.debug("flatten() found new type: %s", str(type(value)))
         return value
 
 
@@ -134,10 +138,19 @@ def create_table(connection, table_name, query_results):
         column_list=column_list,
         place_holders=",".join(["?"] * len(columns)),
     )
+    logger.debug("INSERT template: %s", insert_template)
 
     for row in query_results["rows"]:
         values = [flatten(row.get(column)) for column in columns]
+        # try:
+        # for value in values:
+        #     logger.debug("Value: %s, Type: %s", str(value), str(type(value)))
         connection.execute(insert_template, values)
+        # except Exception as e:
+        #     if logger.isEnabledFor(logging.DEBUG):
+        #         for value in values:
+        #             logger.debug("Value: %s, Type: %s", str(value), str(type(value)))
+        #     raise Exception("Error inserting data: %s", str(e))
 
 
 def prepare_parameterized_query(query, query_params):

redash/serializers/__init__.py

@@ -280,6 +280,7 @@ def serialize_job(job):
         JobStatus.CANCELED: 5,
         JobStatus.DEFERRED: 6,
         JobStatus.SCHEDULED: 7,
+        JobStatus.STOPPED: 8
     }
 
     job_status = job.get_status()
@@ -301,7 +302,7 @@ def serialize_job(job):
         error = job.result["error"]
         status = 4
     else:
-        error = ""
+        error = str(job.exc_info)
         result = query_result_id = job.result
 
     return {