This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 3b35ddf convert postgresql date_trunc() to UTC to prevent pandas
error (#4319)
3b35ddf is described below
commit 3b35ddf135b882bc342fac26c6bd4db52fe3b968
Author: Teemu Haapoja <[email protected]>
AuthorDate: Wed Feb 7 18:18:11 2018 +0200
convert postgresql date_trunc() to UTC to prevent pandas error (#4319)
* cast postgresql date_trunc() to timestamp without time zone to prevent
pandas error
* fix formatting for flake8
* change cast to timezone conversion instead
---
superset/db_engine_specs.py | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/superset/db_engine_specs.py b/superset/db_engine_specs.py
index e24627c..c6496db 100644
--- a/superset/db_engine_specs.py
+++ b/superset/db_engine_specs.py
@@ -288,14 +288,22 @@ class PostgresBaseEngineSpec(BaseEngineSpec):
time_grains = (
Grain('Time Column', _('Time Column'), '{col}'),
- Grain('second', _('second'), "DATE_TRUNC('second', {col})"),
- Grain('minute', _('minute'), "DATE_TRUNC('minute', {col})"),
- Grain('hour', _('hour'), "DATE_TRUNC('hour', {col})"),
- Grain('day', _('day'), "DATE_TRUNC('day', {col})"),
- Grain('week', _('week'), "DATE_TRUNC('week', {col})"),
- Grain('month', _('month'), "DATE_TRUNC('month', {col})"),
- Grain('quarter', _('quarter'), "DATE_TRUNC('quarter', {col})"),
- Grain('year', _('year'), "DATE_TRUNC('year', {col})"),
+ Grain('second', _('second'),
+ "DATE_TRUNC('second', {col}) AT TIME ZONE 'UTC'"),
+ Grain('minute', _('minute'),
+ "DATE_TRUNC('minute', {col}) AT TIME ZONE 'UTC'"),
+ Grain('hour', _('hour'),
+ "DATE_TRUNC('hour', {col}) AT TIME ZONE 'UTC'"),
+ Grain('day', _('day'),
+ "DATE_TRUNC('day', {col}) AT TIME ZONE 'UTC'"),
+ Grain('week', _('week'),
+ "DATE_TRUNC('week', {col}) AT TIME ZONE 'UTC'"),
+ Grain('month', _('month'),
+ "DATE_TRUNC('month', {col}) AT TIME ZONE 'UTC'"),
+ Grain('quarter', _('quarter'),
+ "DATE_TRUNC('quarter', {col}) AT TIME ZONE 'UTC'"),
+ Grain('year', _('year'),
+ "DATE_TRUNC('year', {col}) AT TIME ZONE 'UTC'"),
)
@classmethod
--
To stop receiving notification emails like this one, please contact
[email protected].
