Merge pull request #119 from vartec/master

Unittest for issue #118

Author: julien-duponchelle

pymysqlreplication/tests/__init__.py

@@ -5,5 +5,8 @@
 from pymysqlreplication.tests.test_data_objects import *
 
 if __name__ == "__main__":
-    import unittest
+    if sys.version_info < (2, 7):
+        import unittest2 as unittest
+    else:
+        import unittest
     unittest.main()

pymysqlreplication/tests/base.py

@@ -1,18 +1,17 @@
 # -*- coding: utf-8 -*-
 
 import pymysql
-import unittest
 import copy
 from pymysqlreplication import BinLogStreamReader
 import os
 import sys
 
-(major, minor, _, _, _) = sys.version_info
-if (major, minor) < (2, 7):
-    import unittest2
-    base = unittest2.TestCase
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
 else:
-    base = unittest.TestCase
+    import unittest
+
+base = unittest.TestCase
 
 
 class PyMySQLReplicationTestCase(base):

pymysqlreplication/tests/test_basic.py

@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
-import unittest
-
 import time
+import sys
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    import unittest
 
 from pymysqlreplication.tests import base
 from pymysqlreplication import BinLogStreamReader
@@ -585,6 +588,33 @@ def test_drop_column(self):
         finally:
             self.resetBinLog()
 
+    @unittest.expectedFailure
+    def test_alter_column(self):
+        self.stream.close()
+        self.execute("CREATE TABLE test_alter_column (id INTEGER(11), data VARCHAR(50))")
+        self.execute("INSERT INTO test_alter_column VALUES (1, 'A value')")
+        self.execute("COMMIT")
+        # this is a problem only when column is added in position other than at the end
+        self.execute("ALTER TABLE test_alter_column ADD COLUMN another_data VARCHAR(50) AFTER id")
+        self.execute("INSERT INTO test_alter_column VALUES (2, 'Another value', 'A value')")
+        self.execute("COMMIT")
+
+        self.stream = BinLogStreamReader(
+            self.database,
+            server_id=1024,
+            only_events=(WriteRowsEvent,),
+            )
+        event = self.stream.fetchone()  # insert with two values
+        # both of these asserts fail because of issue underlying proble described in issue #118
+        # because it got table schema info after the alter table, it wrongly assumes the second
+        # column of the first insert is 'another_data'
+        # ER: {'id': 1, 'data': 'A value'}
+        # AR: {'id': 1, 'another_data': 'A value'}
+        self.assertIn("data", event.rows[0]["values"])
+        self.assertNot("another_data", event.rows[0]["values"])
+        self.assertEqual(event.rows[0]["values"]["data"], 'A value')
+        self.stream.fetchone()  # insert with three values
+
 
 class TestGtidBinLogStreamReader(base.PyMySQLReplicationTestCase):
     def setUp(self):

pymysqlreplication/tests/test_data_objects.py

@@ -1,4 +1,8 @@
-import unittest
+import sys
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    import unittest
 
 from pymysqlreplication.column import Column
 from pymysqlreplication.table import Table

pymysqlreplication/tests/test_data_type.py

@@ -2,7 +2,11 @@
 
 import copy
 import platform
-import unittest
+import sys
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    import unittest
 
 from decimal import Decimal
 

setup.py

@@ -11,8 +11,7 @@
 install_requires = ['pymysql']
 
 # add unittest2 to install_requires for python < 2.7
-major, minor, _, _, _ = sys.version_info
-if (major, minor) < (2, 7):
+if sys.version_info < (2, 7):
     install_requires.append("unittest2")