Skip to content

add local timezone support effect datefield datetimefield #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ufully wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add local timezone support effect datefield datetimefield #52

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d5004c
add local timezone support effect datefield datetimefield
ufully Dec 12, 2019
f2b4ae9
change fetch local timezone logic to tzlocal
ufully Dec 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
from infi.clickhouse_orm.models import ModelBase
from infi.clickhouse_orm.database import Database

# fix local timezone
from tzlocal import get_localzone
import os
# fixed local timezone

# PEP 249 module globals
apilevel = '2.0'
threadsafety = 2 # Threads may share the module and connections.
Expand Down Expand Up @@ -355,7 +360,17 @@ def _process_response(self, response):
for r in response:
if not cols:
cols = [(f, r._fields[f].db_type) for f in r._fields]
data.append([getattr(r, f) for f in r._fields])
vals = []
for fi in r._fields:
val = getattr(r, fi)

clickhouseUseLocalTimezone = int(os.getenv('CLICKHOUSE_USE_LOCAL_TIMEZONE', '0'))
Copy link
Contributor

@vavrusa vavrusa May 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you set the variable in the module header with other settings (instead of inside the loop)?

if clickhouseUseLocalTimezone and (r._fields[fi].db_type == 'DateTime' or r._fields[fi].db_type == 'Date'):
val = val.astimezone(get_localzone())

vals.append(val)
data.append(vals)
# data.append([getattr(r, f) for f in r._fields])
Copy link
Contributor

@vavrusa vavrusa May 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove the commented text?

self._data = data
self._columns = cols
self._state = self._STATE_FINISHED