From 11aaaf3e11595d1f7f5a26749ff6fea649fc6a55 Mon Sep 17 00:00:00 2001
From: wangbin <wangbin@papayamobile.com>
Date: Sun, 6 Sep 2015 17:11:11 +0800
Subject: [PATCH] add tzinfo config, useful when start druid without utc
 timezone

---
 panoramix/config.py | 7 +++++++
 panoramix/models.py | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/panoramix/config.py b/panoramix/config.py
index cb4bf8cff..eb61b64a4 100644
--- a/panoramix/config.py
+++ b/panoramix/config.py
@@ -1,6 +1,7 @@
 import os
 from flask_appbuilder.security.manager import AUTH_OID, AUTH_REMOTE_USER, AUTH_DB, AUTH_LDAP, AUTH_OAUTH
 basedir = os.path.abspath(os.path.dirname(__file__))
+from dateutil import tz
 
 """
 All configuration in this file can be overridden by providing a local_config
@@ -41,6 +42,12 @@ APP_NAME = "Panoramix"
 # Uncomment to setup Setup an App icon
 APP_ICON = "/static/chaudron_white.png"
 
+# Druid query timezone
+# tz.tzutc() : Using utc timezone
+# tz.tzlocal() : Using local timezone
+# other tz can be overridden by providing a local_config
+DRUID_TZ = tz.tzutc()
+
 #----------------------------------------------------
 # AUTHENTICATION CONFIG
 #----------------------------------------------------
diff --git a/panoramix/models.py b/panoramix/models.py
index 4f785cb36..08bcf9778 100644
--- a/panoramix/models.py
+++ b/panoramix/models.py
@@ -23,6 +23,7 @@ import requests
 import textwrap
 
 from panoramix import db, get_session
+import config
 
 QueryResult = namedtuple('namedtuple', ['df', 'query', 'duration'])
 
@@ -524,6 +525,8 @@ class Datasource(Model, AuditMixin, Queryable):
             timeseries_limit=None,
             row_limit=None):
         qry_start_dttm = datetime.now()
+        from_dttm = from_dttm.replace(tzinfo=config.DRUID_TZ)  # add tzinfo to native datetime with config
+        to_dttm = to_dttm.replace(tzinfo=config.DRUID_TZ)
 
         query_str = ""
         aggregations = {