e6data-python-connector 2.0.1__py3-none-any.whl → 2.0.3__py3-none-any.whl

e6data_python_connector/datainputstream.py

@@ -8,7 +8,7 @@ from thrift.transport import TTransport
 
 from e6data_python_connector.e6x_vector.ttypes import Chunk, Vector, VectorType
 from e6data_python_connector.constants import ZONE
-from e6data_python_connector.date_time_utils import floor_div, floor_mod
+from e6data_python_connector.date_time_utils import floor_div, floor_mod, get_zone
 
 try:
     from thrift.protocol import fastbinary
@@ -24,6 +24,10 @@ except ImportError:
 _logger = logging.getLogger(__name__)
 
 
+def get_null(vector: Vector, index: int):
+    return vector.nullSet[0] if vector.isConstantVector else vector.nullSet[index]
+
+
 class DataInputStream:
     def __init__(self, stream):
         self.stream = stream
@@ -203,14 +207,14 @@ def get_column_from_chunk(vector: Vector) -> list:
     try:
         if d_type == VectorType.LONG:
             for row in range(vector.size):
-                if vector.nullSet[row]:
+                if get_null(vector, row):
                     value_array.append(None)
                     continue
                 value_array.append(vector.data.int64Data.data[
                                        row] if not vector.isConstantVector else vector.data.numericConstantData.data)
         elif d_type == VectorType.DATE:
             for row in range(vector.size):
-                if vector.nullSet[row]:
+                if get_null(vector, row):
                     value_array.append(None)
                     continue
                 epoch_seconds = floor_div(vector.data.dateData.data[
@@ -221,54 +225,56 @@ def get_column_from_chunk(vector: Vector) -> list:
                 value_array.append(date.strftime("%Y-%m-%d"))
         elif d_type == VectorType.DATETIME:
             for row in range(vector.size):
-                if vector.nullSet[row]:
+                if get_null(vector, row):
                     value_array.append(None)
                     continue
                 epoch_micros = vector.data.timeData.data[
                     row] if not vector.isConstantVector else vector.data.timeConstantData.data
                 epoch_seconds = floor_div(epoch_micros, 1000_000)
                 micros_of_the_day = floor_mod(epoch_micros, 1000_000)
-                date_time = datetime.fromtimestamp(epoch_seconds, ZONE)
+                zone_offset = pytz.timezone('UTC') if vector.zoneOffset == 'Z' else pytz.timezone(
+                    get_zone(vector.zoneOffset))
+                date_time = datetime.fromtimestamp(epoch_seconds, zone_offset)
                 date_time = date_time + timedelta(microseconds=micros_of_the_day)
                 value_array.append(date_time.strftime("%Y-%m-%d %H:%M:%S"))
         elif d_type == VectorType.STRING or d_type == VectorType.ARRAY or d_type == VectorType.MAP or d_type == VectorType.STRUCT:
             for row in range(vector.size):
-                if vector.nullSet[row]:
+                if get_null(vector, row):
                     value_array.append(None)
                     continue
                 value_array.append(vector.data.varcharData.data[
                                        row] if not vector.isConstantVector else vector.data.varcharConstantData.data)
         elif d_type == VectorType.DOUBLE:
             for row in range(vector.size):
-                if vector.nullSet[row]:
+                if get_null(vector, row):
                     value_array.append(None)
                     continue
                 value_array.append(vector.data.float64Data.data[
                                        row] if not vector.isConstantVector else vector.data.numericDecimalConstantData.data)
         elif d_type == VectorType.BINARY:
             for row in range(vector.size):
-                if vector.nullSet[row]:
+                if get_null(vector, row):
                     value_array.append(None)
                     continue
                 value_array.append(vector.data.varcharData.data[
                                        row] if not vector.isConstantVector else vector.data.varcharConstantData.data)
         elif d_type == VectorType.FLOAT:
             for row in range(vector.size):
-                if vector.nullSet[row]:
+                if get_null(vector, row):
                     value_array.append(None)
                     continue
                 value_array.append(vector.data.float32Data.data[
                                        row] if not vector.isConstantVector else vector.data.numericDecimalConstantData.data)
         elif d_type == VectorType.BOOLEAN:
             for row in range(vector.size):
-                if vector.nullSet[row]:
+                if get_null(vector, row):
                     value_array.append(None)
                     continue
                 value_array.append(vector.data.boolData.data[
                                        row] if not vector.isConstantVector else vector.data.boolConstantData.data)
         elif d_type == VectorType.INTEGER:
             for row in range(vector.size):
-                if vector.nullSet[row]:
+                if get_null(vector, row):
                     value_array.append(None)
                     continue
                 value_array.append(vector.data.int32Data.data[

e6data_python_connector/e6data_grpc.py

@@ -395,6 +395,7 @@ class Cursor(DBAPICursor):
         """
         Semicolon is now not supported. So removing it from query end.
         """
+        operation = operation.strip()  # Remove leading and trailing whitespaces.
         if operation.endswith(';'):
             operation = operation[:-1]
 

{e6data_python_connector-2.0.1.dist-info → e6data_python_connector-2.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e6data-python-connector
-Version: 2.0.1
+Version: 2.0.3
 Summary: Client for the e6data distributed SQL Engine.
 Home-page: https://github.com/e6x-labs/e6data-python-connector
 Author: Uniphi, Inc.
@@ -27,7 +27,7 @@ Requires-Dist: sqlalchemy
 
 # e6data Python Connector
 
-![version](https://img.shields.io/badge/version-2.0.1-blue.svg)
+![version](https://img.shields.io/badge/version-2.0.3-blue.svg)
 
 ## Introduction
 

{e6data_python_connector-2.0.1.dist-info → e6data_python_connector-2.0.3.dist-info}/RECORD

@@ -1,10 +1,10 @@
 e6data_python_connector/__init__.py,sha256=x_VwhPQ7XLlthR-NJL9Vl7lkLBRCG2pSjmyZSBHOBpM,103
 e6data_python_connector/common.py,sha256=nk0CDQ5j1iu8DctBOXX4QypPYmxSgIgoA-Cn1UZXLic,9976
 e6data_python_connector/constants.py,sha256=h5w0lWiFsxz__zUZRlo1f72-8mT_vt9gcWvtWh0viFI,682
-e6data_python_connector/datainputstream.py,sha256=wxWY2PU8nPS44Exms7jfjpJYz1C_HOOsBga8tVXu5gg,11242
+e6data_python_connector/datainputstream.py,sha256=P0DOwzhcn18tpIfKayQCa_gylDK7htaLNcoMW5cZfgY,11552
 e6data_python_connector/date_time_utils.py,sha256=ew1CjhfB93trRdu8jBOy2ihZNSecDPcmxS1USmWxqzE,13623
 e6data_python_connector/dialect.py,sha256=-FFQ4mjSviqfcnDC0Ju0c1p3i4XqFLmekPd-CSZ_g0Q,10938
-e6data_python_connector/e6data_grpc.py,sha256=pTDfGak340wmP3aqFe-0ZNH2L2-ID6rg0LIIqxwE_Xc,20766
+e6data_python_connector/e6data_grpc.py,sha256=-wPh3JVBetVPeTWTED7TMge2TbGNotgP0l5kaDqyuuY,20848
 e6data_python_connector/exceptions.py,sha256=vrUqdzMq3LjbCmvr5_TcRq9eKmdqGfe-uVjR0BJQf5U,382
 e6data_python_connector/typeId.py,sha256=2EMNWK2SO5CBReNuJphma6xp-69r9GDwwys66t-kSk0,1777
 e6data_python_connector/e6x_vector/__init__.py,sha256=YFcZTT8Cm-6Y4oTiCaqq0DT1lw2W09WqoEc5_pTAwW0,34
@@ -17,9 +17,9 @@ e6data_python_connector/server/e6x_engine_pb2.py,sha256=2aShk-jX1UQxFzMVx58gXf9N
 e6data_python_connector/server/e6x_engine_pb2.pyi,sha256=z5olI2I4xHNivRULRmsEXvuEpmxX2vlnUMk8YarmMY8,17824
 e6data_python_connector/server/e6x_engine_pb2_grpc.py,sha256=pezNVTO8oSCDcVr0fYi-zlr2X71Q6nDNeMooVNHMITo,45052
 e6data_python_connector/server/ttypes.py,sha256=uWxwSp4m6e-7SeSEckbZtSduGYmfzXWM09iy5eltBPA,21227
-e6data_python_connector-2.0.1.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-e6data_python_connector-2.0.1.dist-info/METADATA,sha256=8BykS9vVqcqnZtUcmY-aaumktysFuNYEsiFXzLSHdpQ,6976
-e6data_python_connector-2.0.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-e6data_python_connector-2.0.1.dist-info/entry_points.txt,sha256=MDK4cAOND0preLvq2Tlpnz00wXnP_Y_UopqJsAf3U7Y,77
-e6data_python_connector-2.0.1.dist-info/top_level.txt,sha256=ChOS6qLf-SQycXr0uBiVxomIfYfbH2SgwrOWhW79ab0,24
-e6data_python_connector-2.0.1.dist-info/RECORD,,
+e6data_python_connector-2.0.3.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+e6data_python_connector-2.0.3.dist-info/METADATA,sha256=a6lGKRebwIxPeWppYdCF-djboximM8EBH3OuBvY5O4g,6976
+e6data_python_connector-2.0.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+e6data_python_connector-2.0.3.dist-info/entry_points.txt,sha256=MDK4cAOND0preLvq2Tlpnz00wXnP_Y_UopqJsAf3U7Y,77
+e6data_python_connector-2.0.3.dist-info/top_level.txt,sha256=ChOS6qLf-SQycXr0uBiVxomIfYfbH2SgwrOWhW79ab0,24
+e6data_python_connector-2.0.3.dist-info/RECORD,,