Merge pull request julien-duponchelle#45 from phoenixluo/master

julien-duponchelle · julien-duponchelle · commit 751132576dea · 2013-08-18T02:53:02.000-07:00
fix new decimal parsing problem
diff --git a/pymysqlreplication/row_event.py b/pymysqlreplication/row_event.py
@@ -320,18 +320,18 @@ def __read_new_decimal(self, column):
 
         for i in range(0, uncomp_integral):
             value = struct.unpack('>i', self.packet.read(4))[0] ^ mask
-            res += str(value)
+            res += '%09d' % value
 
         res += "."
 
         for i in range(0, uncomp_fractional):
             value = struct.unpack('>i', self.packet.read(4))[0] ^ mask
-            res += str(value)
+            res += '%09d' % value
 
         size = compressed_bytes[comp_fractional]
         if size > 0:
             value = self.packet.read_int_be_by_size(size) ^ mask
-            res += str(value)
+            res += '%0*d' % (comp_fractional, value)
 
         return decimal.Decimal(res)
 
diff --git a/pymysqlreplication/tests/test_data_type.py b/pymysqlreplication/tests/test_data_type.py
@@ -58,6 +58,23 @@ def test_decimal_long_values(self):
         event = self.create_and_insert_value(create_query, insert_query)
         self.assertEqual(event.rows[0]["values"]["test"], Decimal("42000.123456"))
 
+    def test_decimal_long_values_1(self):
+        create_query = "CREATE TABLE test (\
+            test DECIMAL(20,10) \
+        )"
+        insert_query = "INSERT INTO test VALUES(9000000123.123456)"
+        event = self.create_and_insert_value(create_query, insert_query)
+        self.assertEqual(event.rows[0]["values"]["test"], Decimal("9000000123.123456"))
+
+    def test_decimal_long_values_2(self):
+        create_query = "CREATE TABLE test (\
+            test DECIMAL(20,10) \
+        )"
+        insert_query = "INSERT INTO test VALUES(9000000123.0000012345)"
+        event = self.create_and_insert_value(create_query, insert_query)
+        self.assertEqual(event.rows[0]["values"]["test"],
+                Decimal("9000000123.0000012345"))
+
     def test_decimal_negative_values(self):
         create_query = "CREATE TABLE test (\
             test DECIMAL(20,10) \
