pt/superset
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2024-09-12 00:29:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: epoch_s and epoch_ms to date time (#4664)

Browse Source
This commit is contained in:
yanyu 2018-03-22 23:13:38 +08:00 committed by Maxime Beauchemin
parent ec069676fd
commit b9965230df
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
superset/viz.py
View File

@ -155,7 +155,8 @@ class BaseViz(object):
else:
if DTTM_ALIAS in df.columns:
if timestamp_format in ('epoch_s', 'epoch_ms'):
df[DTTM_ALIAS] = pd.to_datetime(df[DTTM_ALIAS], utc=False)
df[DTTM_ALIAS] = pd.to_datetime(
df[DTTM_ALIAS], utc=False, unit=timestamp_format[6:])
else:
df[DTTM_ALIAS] = pd.to_datetime(
df[DTTM_ALIAS], utc=False, format=timestamp_format)