Merge pull request julien-duponchelle#169 from abrarsheikh/master

encode mysql time as python datetime.timedelta

Signed-off-by: Arthur Gautier <baloo@gandi.net>

Author: Arthur Gautier

CHANGELOG

@@ -83,3 +83,6 @@
 * fix: missing update _next_seq_no
 * PyMYSQL 0.7
 * Add more contributors
+
+0.10 NOT YET RELEASED
+* row-events: TIME is now encoded as python.timedelta

README.md

@@ -309,6 +309,7 @@ Other contributors:
 * Giovanni F. MySQL 5.7 support https://github.com/26fe
 * Igor Mastak intvar event https://github.com/mastak
 * Xie Zhenye fix: missing update _next_seq_no https://github.com/xiezhenye
+* Abrar Sheikh: Time as mysql.timedelta
 
 Thanks to GetResponse for their support
 

pymysqlreplication/row_event.py

@@ -177,6 +177,12 @@ def __add_fsp_to_time(self, time, column):
         For more details about new date format:
         http://dev.mysql.com/doc/internals/en/date-and-time-data-type-representation.html
         """
+        microsecond = self.__read_fsp(column)
+        if microsecond > 0:
+            time = time.replace(microsecond=microsecond)
+        return time
+
+    def __read_fsp(self, column):
         read = 0
         if column.fsp == 1 or column.fsp == 2:
             read = 1
@@ -187,10 +193,11 @@ def __add_fsp_to_time(self, time, column):
         if read > 0:
             microsecond = self.packet.read_int_be_by_size(read)
             if column.fsp % 2:
-                time = time.replace(microsecond=int(microsecond / 10))
+                return int(microsecond / 10)
             else:
-                time = time.replace(microsecond=microsecond)
-        return time
+                return microsecond
+
+        return 0
 
     def __read_string(self, size, column):
         string = self.packet.read_length_coded_pascal_string(size)
@@ -223,10 +230,10 @@ def __read_bit(self, column):
 
     def __read_time(self):
         time = self.packet.read_uint24()
-        date = datetime.time(
-            hour=int(time / 10000),
-            minute=int((time % 10000) / 100),
-            second=int(time % 100))
+        date = datetime.timedelta(
+            hours=int(time / 10000),
+            minutes=int((time % 10000) / 100),
+            seconds=int(time % 100))
         return date
 
     def __read_time2(self, column):
@@ -241,11 +248,20 @@ def __read_time2(self, column):
         24 bits = 3 bytes
         """
         data = self.packet.read_int_be_by_size(3)
-        t = datetime.time(
-            hour=self.__read_binary_slice(data, 2, 10, 24),
-            minute=self.__read_binary_slice(data, 12, 6, 24),
-            second=self.__read_binary_slice(data, 18, 6, 24))
-        return self.__add_fsp_to_time(t, column)
+
+        sign = 1 if self.__read_binary_slice(data, 0, 1, 24) else -1
+        if sign == -1:
+            # negative integers are stored as 2's compliment 
+            # hence take 2's compliment again to get the right value.
+            data = ~data + 1
+
+        t = datetime.timedelta(
+            hours=sign*self.__read_binary_slice(data, 2, 10, 24),
+            minutes=self.__read_binary_slice(data, 12, 6, 24),
+            seconds=self.__read_binary_slice(data, 18, 6, 24),
+            microseconds=self.__read_fsp(column)
+        )
+        return t
 
     def __read_date(self):
         time = self.packet.read_uint24()

pymysqlreplication/tests/test_data_type.py

@@ -266,16 +266,36 @@ def test_zero_day(self):
         self.assertEqual(event.rows[0]["values"]["test2"], None)
 
     def test_time(self):
-        create_query = "CREATE TABLE test (test TIME);"
-        insert_query = "INSERT INTO test VALUES('12:33:18')"
+        create_query = "CREATE TABLE test (test1 TIME, test2 TIME);"
+        insert_query = "INSERT INTO test VALUES('838:59:59', '-838:59:59')"
         event = self.create_and_insert_value(create_query, insert_query)
-        self.assertEqual(event.rows[0]["values"]["test"], datetime.time(12, 33, 18))
+        self.assertEqual(event.rows[0]["values"]["test1"], datetime.timedelta(
+            microseconds=(((838*60) + 59)*60 + 59)*1000000
+        ))
+        self.assertEqual(event.rows[0]["values"]["test2"], datetime.timedelta(
+            microseconds=(((-838*60) + 59)*60 + 59)*1000000
+        ))
+
+    def test_time2(self):
+        if not self.isMySQL56AndMore():
+            self.skipTest("Not supported in this version of MySQL")
+        create_query = "CREATE TABLE test (test1 TIME(6), test2 TIME(6));"
+        insert_query = """
+            INSERT INTO test VALUES('838:59:59.000000', '-838:59:59.000000');
+        """
+        event = self.create_and_insert_value(create_query, insert_query)
+        self.assertEqual(event.rows[0]["values"]["test1"], datetime.timedelta(
+            microseconds=(((838*60) + 59)*60 + 59)*1000000 + 0
+        ))
+        self.assertEqual(event.rows[0]["values"]["test2"], datetime.timedelta(
+            microseconds=(((-838*60) + 59)*60 + 59)*1000000 + 0
+        ))
 
     def test_zero_time(self):
         create_query = "CREATE TABLE test (id INTEGER, test TIME NOT NULL DEFAULT 0);"
         insert_query = "INSERT INTO test (id) VALUES(1)"
         event = self.create_and_insert_value(create_query, insert_query)
-        self.assertEqual(event.rows[0]["values"]["test"], datetime.time(0,0))
+        self.assertEqual(event.rows[0]["values"]["test"], datetime.timedelta(seconds=0))
 
     def test_datetime(self):
         create_query = "CREATE TABLE test (test DATETIME);"