[DPY-14] Keep server time zone in sync with client time zone (#186) (#188)

* [DPY-14] Keep server time zone in sync with client time zone (#186)

* [DPY-14] Keep server time zone in sync with client time zone

* removed extra spacing

* added:check_session_version

---------

Co-authored-by: Vats3ds <[email protected]>

* updated test and timestamp from ticks function

* removed:print and unnecessary imports

---------

Co-authored-by: Vats Shivam <[email protected]>

Author: Vats3ds

pynuodb/datatype.py

@@ -183,11 +183,15 @@ def TimestampFromTicks(ticks, micro=0, zoneinfo=LOCALZONE):
     if y < 10000:
         dt = utc_TimeStamp(year=y, month=m, day=d, hour=hour,
                            minute=min, second=sec, microsecond=micro)
+        if zoneinfo is None:
+            return dt.replace(tzinfo=None)
         dt = dt.astimezone(zoneinfo)
     else:
         # shift one day.
         dt = utc_TimeStamp(year=9999, month=12, day=31, hour=hour,
                            minute=min, second=sec, microsecond=micro)
+        if zoneinfo is None:
+            return dt.replace(tzinfo=None)
         dt = dt.astimezone(zoneinfo)
         # add day back.
         dt += TimeDelta(days=1)

pynuodb/encodedsession.py

@@ -382,6 +382,12 @@ def create_statement(self):
 
     def __execute_postfix(self):
         # type: () -> None
+        if self.__sessionVersion >= protocol.TIMESTAMP_WITHOUT_TZ:
+            tzUpdate = self.getBoolean()
+            if tzUpdate:
+                server_tz = self.getValue()
+                self.__timezone_name = server_tz
+        
         txid = self.getInt()
         sid = self.getInt()
         seqid = self.getInt()
@@ -1106,6 +1112,21 @@ def getScaledTimestamp(self):
             return datatype.TimestampFromTicks(seconds, micros, self.timezone_info)
 
         raise DataError('Not a scaled timestamp')
+    
+    def getScaledTimestampNoTz(self):
+        # type: () -> datatype.Timestamp
+        """Read the next Scaled Timestamp without timezone value off the session.
+
+        :rtype: datetime.datetime
+        """
+        code = self._getTypeCode()
+        if code == protocol.SCALEDTIMESTAMPNOTZ:
+            scale = crypt.fromByteString(self._takeBytes(1))
+            stamp = crypt.fromSignedByteString(self._takeBytes(code - protocol.SCALEDTIMESTAMPNOTZLEN0))
+            seconds, micros = self.__unpack(scale, stamp)
+            return datatype.TimestampFromTicks(seconds, micros, None)
+
+        raise DataError('Not a scaled timestamp without time zone')
 
     def getScaledDate(self):
         # type: () -> datatype.Date
@@ -1266,6 +1287,9 @@ def getValue(self):
         if code >= protocol.SCALEDDATELEN1 and code <= protocol.SCALEDDATELEN8:
             return self.getScaledDate()
 
+        if code == protocol.SCALEDTIMESTAMPNOTZ:
+            return self.getScaledTimestampNoTz()
+
         if code == protocol.NULL:
             return self.getNull()
 

pynuodb/protocol.py

@@ -61,6 +61,7 @@
 LOBSTREAM1                        = 227
 LOBSTREAM4                        = 230
 ARRAYLEN1                         = 231
+SCALEDTIMESTAMPNOTZLEN0           = 233
 ARRAYLEN8                         = 238
 SCALEDCOUNT3                      = 239
 DEBUGBARRIER                      = 240
@@ -377,5 +378,5 @@ def lookup_code(error_code):
 # The newest feature this driver supports.
 # The server will negotiate the highest compatible version.
 CURRENT_PROTOCOL_MAJOR     = 1
-CURRENT_PROTOCOL_VERSION   = CURSOR_HOLDABILITY
+CURRENT_PROTOCOL_VERSION   = TIMESTAMP_WITHOUT_TZ
 AUTH_TEST_STR              = 'Success!'

tests/nuodb_types_test.py

@@ -14,6 +14,7 @@
 from .mock_tzs import localize
 
 
+
 class TestNuoDBTypes(nuodb_base.NuoBase):
     def test_boolean_types(self):
         con = self._connect()
@@ -109,12 +110,12 @@ def test_datetime_types(self):
 
         cursor.execute("SELECT * FROM tmp")
         row = cursor.fetchone()
-
+        
         assert len(row) == 4
         assert row[0] == datetime.date(2000, 1, 1)
         assert row[1] == datetime.time(5, 44, 33, 221100)
         assert row[2] == localize(datetime.datetime(2000, 1, 1, 5, 44, 33, 221100))
-        assert row[3] == localize(datetime.datetime(2000, 1, 1, 5, 44, 33, 221100))
+        assert localize(row[3]) == localize(datetime.datetime(2000, 1, 1, 5, 44, 33, 221100))
 
 
     def test_null_type(self):