Merge pull request #150 from 26fe/mysql5.7

test run with mysql5.7

Author: julien-duponchelle

pymysqlreplication/tests/base.py

@@ -23,6 +23,7 @@ def setUp(self):
             "host": "localhost",
             "user": "root",
             "passwd": "",
+            "port": 3306,
             "use_unicode": True,
             "charset": "utf8",
             "db": "pymysqlreplication_test"
@@ -54,6 +55,10 @@ def isMySQL56AndMore(self):
             return True
         return False
 
+    def isMySQL57(self):
+        version = float(self.getMySQLVersion().rsplit('.', 1)[0])
+        return version == 5.7
+
     @property
     def supportsGTID(self):
         if not self.isMySQL56AndMore():
@@ -82,3 +87,21 @@ def resetBinLog(self):
             self.stream.close()
         self.stream = BinLogStreamReader(self.database, server_id=1024,
                                          ignored_events=self.ignoredEvents())
+
+    def set_sql_mode(self):
+        """set sql_mode to test with same sql_mode (mysql 5.7 sql_mode default is changed)"""
+        version = float(self.getMySQLVersion().rsplit('.', 1)[0])
+        if version == 5.7:
+            self.execute("set @@sql_mode='NO_ENGINE_SUBSTITUTION'")
+
+    def bin_log_format(self):
+        query = "select @@binlog_format"
+        cursor = self.execute(query)
+        result = cursor.fetchone()
+        return result[0]
+
+    def bin_log_basename(self):
+        cursor = self.execute('select @@log_bin_basename')
+        bin_log_basename = cursor.fetchone()[0]
+        bin_log_basename = bin_log_basename.split("/")[-1]
+        return bin_log_basename

pymysqlreplication/tests/test_basic.py

@@ -32,7 +32,7 @@ def test_read_query_event(self):
 
         event = self.stream.fetchone()
         self.assertEqual(event.position, 4)
-        self.assertEqual(event.next_binlog, "mysql-bin.000001")
+        self.assertEqual(event.next_binlog, self.bin_log_basename() + ".000001")
         self.assertIsInstance(event, RotateEvent)
 
         self.assertIsInstance(self.stream.fetchone(), FormatDescriptionEvent)
@@ -47,7 +47,7 @@ def test_read_query_event_with_unicode(self):
 
         event = self.stream.fetchone()
         self.assertEqual(event.position, 4)
-        self.assertEqual(event.next_binlog, "mysql-bin.000001")
+        self.assertEqual(event.next_binlog, self.bin_log_basename() + ".000001")
         self.assertIsInstance(event, RotateEvent)
 
         self.assertIsInstance(self.stream.fetchone(), FormatDescriptionEvent)
@@ -146,6 +146,7 @@ def test_filtering_ignore_events(self):
 
     def test_filtering_table_event(self):
         self.stream.close()
+        self.assertEqual(self.bin_log_format(), "ROW")
         self.stream = BinLogStreamReader(
             self.database,
             server_id=1024,

pymysqlreplication/tests/test_data_type.py

@@ -194,6 +194,7 @@ def test_timestamp(self):
     def test_timestamp_mysql56(self):
         if not self.isMySQL56AndMore():
             self.skipTest("Not supported in this version of MySQL")
+        self.set_sql_mode()
         create_query = '''CREATE TABLE test (test0 TIMESTAMP(0),
             test1 TIMESTAMP(1),
             test2 TIMESTAMP(2),
@@ -249,13 +250,15 @@ def test_zero_date(self):
         self.assertEqual(event.rows[0]["values"]["test2"], None)
 
     def test_zero_month(self):
+        self.set_sql_mode()
         create_query = "CREATE TABLE test (id INTEGER, test DATE, test2 DATE);"
         insert_query = "INSERT INTO test (id, test2) VALUES(1, '2015-00-21')"
         event = self.create_and_insert_value(create_query, insert_query)
         self.assertEqual(event.rows[0]["values"]["test"], None)
         self.assertEqual(event.rows[0]["values"]["test2"], None)
 
     def test_zero_day(self):
+        self.set_sql_mode()
         create_query = "CREATE TABLE test (id INTEGER, test DATE, test2 DATE);"
         insert_query = "INSERT INTO test (id, test2) VALUES(1, '2015-05-00')"
         event = self.create_and_insert_value(create_query, insert_query)
@@ -281,18 +284,23 @@ def test_datetime(self):
         self.assertEqual(event.rows[0]["values"]["test"], datetime.datetime(1984, 12, 3, 12, 33, 7))
 
     def test_zero_datetime(self):
+        self.set_sql_mode()
         create_query = "CREATE TABLE test (id INTEGER, test DATETIME 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"], None)
 
     def test_broken_datetime(self):
+        self.set_sql_mode()
         create_query = "CREATE TABLE test (test DATETIME NOT NULL);"
         insert_query = "INSERT INTO test VALUES('2013-00-00 00:00:00')"
         event = self.create_and_insert_value(create_query, insert_query)
         self.assertEqual(event.rows[0]["values"]["test"], None)
 
     def test_year(self):
+        if self.isMySQL57():
+            # https://dev.mysql.com/doc/refman/5.7/en/migrating-to-year4.html
+            self.skipTest("YEAR(2) is unsupported in mysql 5.7")
         create_query = "CREATE TABLE test (a YEAR(4), b YEAR(2))"
         insert_query = "INSERT INTO test VALUES(1984, 1984)"
         event = self.create_and_insert_value(create_query, insert_query)