Moved check to the correct place. (#1606)

apache · Nov 15, 2016 · af04a56 · af04a56
1 parent 9124a17
commit af04a56
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/superset/models.py b/superset/models.py
@@ -2076,10 +2076,10 @@ def recursive_get_fields(_conf):
         query_str += json.dumps(
             client.query_builder.last_query.query_dict, indent=2)
         df = client.export_pandas()
-        df.columns = [
-            DTTM_ALIAS if c == 'timestamp' else c for c in df.columns]
         if df is None or df.size == 0:
             raise Exception(_("No data was returned."))
+        df.columns = [
+            DTTM_ALIAS if c == 'timestamp' else c for c in df.columns]
 
         if (
                 not is_timeseries and