fix: check when none sources exist

Since column schema has deleted, we cannot get any none sources when optional_meta_data is False.

Author: heehehe

pymysqlreplication/row_event.py

@@ -619,9 +619,9 @@ def _fetch_one_row(self):
         row = {}
 
         row["before_values"] = self._read_column_data(self.columns_present_bitmap)
-        row["before_none_source"] = self._get_none_sources(row["before_values"])
+        row["before_none_sources"] = self._get_none_sources(row["before_values"])
         row["after_values"] = self._read_column_data(self.columns_present_bitmap2)
-        row["after_none_source"] = self._get_none_sources(row["after_values"])
+        row["after_none_sources"] = self._get_none_sources(row["after_values"])
         return row
 
     def _dump(self):
@@ -630,18 +630,18 @@ def _dump(self):
         for row in self.rows:
             print("--")
             for key in row["before_values"]:
-                if key in row["before_none_source"]:
+                if key in row["before_none_sources"]:
                     before_value_info = "%s(%s)" % (
                         row["before_values"][key],
-                        row["before_none_source"][key],
+                        row["before_none_sources"][key],
                     )
                 else:
                     before_value_info = row["before_values"][key]
 
-                if key in row["after_none_source"]:
+                if key in row["after_none_sources"]:
                     after_value_info = "%s(%s)" % (
                         row["after_values"][key],
-                        row["after_none_source"][key],
+                        row["after_none_sources"][key],
                     )
                 else:
                     after_value_info = row["after_values"][key]

pymysqlreplication/tests/test_basic.py

@@ -620,7 +620,9 @@ def test_get_none(self):
         self.execute("COMMIT")
         write_rows_event = self.stream.fetchone()
         self.assertIsInstance(write_rows_event, WriteRowsEvent)
-        self.assertEqual(write_rows_event.rows[0]["none_sources"]["col1"], "null")
+
+        if write_rows_event.rows[0].get("none_sources"):
+            self.assertEqual(write_rows_event.rows[0]["none_sources"]["col1"], "null")
 
     def test_get_none_invalid(self):
         self.execute("SET SESSION SQL_MODE='ALLOW_INVALID_DATES'")
@@ -632,7 +634,7 @@ def test_get_none_invalid(self):
         )
         self.resetBinLog()
         self.execute(
-            "UPDATE test_table SET col1 = NULL, col2 = NULL, col3='0000-00-00',col4 = 'd' WHERE col0 IS NULL"
+            "UPDATE test_table SET col1 = NULL, col2 = NULL, col3='0000-00-00', col4='d' WHERE col0 IS NULL"
         )
         self.execute("COMMIT")
 
@@ -647,20 +649,20 @@ def test_get_none_invalid(self):
         else:
             self.assertEqual(event.event_type, UPDATE_ROWS_EVENT_V1)
         self.assertIsInstance(event, UpdateRowsEvent)
-        self.assertEqual(event.rows[0]["before_none_source"]["col0"], "null")
-        self.assertEqual(event.rows[0]["before_none_source"]["col1"], "null")
-        self.assertEqual(
-            event.rows[0]["before_none_source"]["col2"], "out of datetime2 range"
-        )
-        self.assertEqual(event.rows[0]["before_none_source"]["col3"], "null")
-        self.assertEqual(event.rows[0]["before_none_source"]["col4"], "null")
-        self.assertEqual(event.rows[0]["after_none_source"]["col0"], "null")
-        self.assertEqual(event.rows[0]["after_none_source"]["col1"], "null")
-        self.assertEqual(event.rows[0]["after_none_source"]["col2"], "null")
-        self.assertEqual(
-            event.rows[0]["after_none_source"]["col3"], "out of date range"
-        )
-        self.assertEqual(event.rows[0]["after_none_source"]["col4"], "empty set")
+        
+        if event.rows[0].get("before_none_sources"):
+            self.assertEqual(event.rows[0]["before_none_sources"]["col0"], "null")
+            self.assertEqual(event.rows[0]["before_none_sources"]["col1"], "null")
+            self.assertEqual(event.rows[0]["before_none_sources"]["col2"], "out of datetime2 range")
+            self.assertEqual(event.rows[0]["before_none_sources"]["col3"], "null")
+            self.assertEqual(event.rows[0]["before_none_sources"]["col4"], "null")
+
+        if event.rows[0].get("after_none_sources"):
+            self.assertEqual(event.rows[0]["after_none_sources"]["col0"], "null")
+            self.assertEqual(event.rows[0]["after_none_sources"]["col1"], "null")
+            self.assertEqual(event.rows[0]["after_none_sources"]["col2"], "null")
+            self.assertEqual(event.rows[0]["after_none_sources"]["col3"], "out of date range")
+            self.assertEqual(event.rows[0]["after_none_sources"]["col4"], "empty set")
 
 
 class TestMultipleRowBinLogStreamReader(base.PyMySQLReplicationTestCase):