graceguo-supercat closed pull request #3891: [BUGFIX]: Fixing dttm_sql_literal
to use python_date_format
URL: https://github.com/apache/incubator-superset/pull/3891
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/superset/connectors/sqla/models.py
b/superset/connectors/sqla/models.py
index 599062265d..e505c36871 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -101,18 +101,19 @@ def dttm_sql_literal(self, dttm):
If database_expression is not empty, the internal dttm
will be parsed as the sql sentence for the database to convert
"""
-
- tf = self.python_date_format or '%Y-%m-%d %H:%M:%S.%f'
+ tf = self.python_date_format
if self.database_expression:
return self.database_expression.format(dttm.strftime('%Y-%m-%d
%H:%M:%S'))
- elif tf == 'epoch_s':
- return str((dttm - datetime(1970, 1, 1)).total_seconds())
- elif tf == 'epoch_ms':
- return str((dttm - datetime(1970, 1, 1)).total_seconds() * 1000.0)
+ elif tf:
+ if tf == 'epoch_s':
+ return str((dttm - datetime(1970, 1, 1)).total_seconds())
+ elif tf == 'epoch_ms':
+ return str((dttm - datetime(1970, 1, 1)).total_seconds() *
1000.0)
+ return "'{}'".format(dttm.strftime(tf))
else:
s = self.table.database.db_engine_spec.convert_dttm(
self.type or '', dttm)
- return s or "'{}'".format(dttm.strftime(tf))
+ return s or "'{}'".format(dttm.strftime('%Y-%m-%d %H:%M:%S.%f'))
class SqlMetric(Model, BaseMetric):
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
