fix: Bad date type in email text report for table chart

superset/utils/csv.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+import logging
 import re
 import urllib.request
 from typing import Any, Dict, Optional
@@ -22,6 +23,10 @@
 import pandas as pd
 import simplejson
 
+from superset.utils.core import GenericDataType
+
+logger = logging.getLogger(__name__)
+
 negative_number_re = re.compile(r"^-[0-9.]+$")
 
 # This regex will match if the string starts with:
@@ -97,11 +102,22 @@ def get_chart_dataframe(
         return None
 
     result = simplejson.loads(content.decode("utf-8"))
-
     # need to convert float value to string to show full long number
     pd.set_option("display.float_format", lambda x: str(x))
     df = pd.DataFrame.from_dict(result["result"][0]["data"])
 
+    try:
+        # if any column type is equal to 2, need to convert data into
+        # datetime timestamp for that column.
+        if GenericDataType.TEMPORAL in result["result"][0]["coltypes"]:
+            for i in range(len(result["result"][0]["coltypes"])):
+                if result["result"][0]["coltypes"][i] == GenericDataType.TEMPORAL:
+                    df[result["result"][0]["colnames"][i]] = df[
+                        result["result"][0]["colnames"][i]
+                    ].astype("datetime64[ms]")
+    except BaseException as err:
+        logger.error(err)
+
     # rebuild hierarchical columns and index
     df.columns = pd.MultiIndex.from_tuples(
         tuple(colname) if isinstance(colname, list) else (colname,)

tests/integration_tests/reports/commands_tests.py

@@ -971,6 +971,7 @@ def test_email_chart_report_schedule_with_text(
                     },
                     "colnames": [("t1",), ("t2",), ("t3__sum",)],
                     "indexnames": [(0,), (1,)],
+                    "coltypes": [1, 1],
                 },
             ],
         }