Try another test fix

Author: julien-duponchelle

docs/mysql57_support.rst

@@ -5,12 +5,12 @@ MySQL 5.7, MySQL 8.0+ and `use_column_name_cache`
 
 In MySQL 5.7 and earlier, the binary log events for row-based replication do not include column name metadata. This means that `python-mysql-replication` cannot map column values to their names directly from the binlog event.
 
-Starting with MySQL 8.0.1, the `binlog_row_metadata` system variable was introduced to control the amount of metadata written to the binary log. The default value for this variable is `MINIMAL`, which provides the same behavior as MySQL 5.7.
+Starting with MySQL 8.0.1, the `binlog_row_metadata` system variable was introduced to control the amount of metadata written to the binary log. This is a **GLOBAL** and **DYNAMIC** variable. The default value for this variable is `MINIMAL`, which provides the same behavior as MySQL 5.7.
 
 The Problem
 -----------
 
-When column metadata is not present in the binlog (as in MySQL 5.7 and earlier, or when `binlog_row_metadata` is set to `MINIMAL` in MySQL 8.0+), the `values` dictionary in a `WriteRowsEvent`, `UpdateRowsEvent`, or `DeleteRowsEvent` will contain integer keys corresponding to the column index, not the column names.
+When column metadata is not present in the binlog (as in MySQL 5.7 and earlier, or when `binlog_row_metadata` is set to `MINIMAL` globally in MySQL 8.0+), the `values` dictionary in a `WriteRowsEvent`, `UpdateRowsEvent`, or `DeleteRowsEvent` will contain integer keys corresponding to the column index, not the column names.
 
 For example, for a table `users` with columns `id` and `name`, an insert event might look like this:
 
@@ -32,7 +32,7 @@ This allows you to receive row data with column names as keys.
 MySQL 8.0+ with `binlog_row_metadata=FULL`
 ------------------------------------------
 
-In MySQL 8.0.1 and later, you can set `binlog_row_metadata` to `FULL`. When this setting is enabled, the column names are included directly in the binlog events, and `use_column_name_cache` is not necessary.
+In MySQL 8.0.1 and later, you can set `binlog_row_metadata` to `FULL` using `SET GLOBAL binlog_row_metadata = 'FULL'`. When this setting is enabled, the column names are included directly in the binlog events, and `use_column_name_cache` is not necessary.
 
 Example
 -------

pymysqlreplication/tests/test_basic.py

@@ -272,13 +272,24 @@ def test_write_row_event(self):
             self.assertEqual(event.columns[1].name, "data")
 
     def test_fetch_column_names_from_schema(self):
-        # This test is for MySQL 5.7+
-        if not self.isMySQL57AndMore():
-            self.skipTest("Test for MySQL 5.7+ where binlog_row_metadata can be MINIMAL")
+        # This test is for scenarios where column names are NOT in the binlog
+        # (MySQL 5.7 or older, or MySQL 8.0+ with binlog_row_metadata=MINIMAL)
 
-        # Minimal is only supported for MySQL 8 and later        
-        if self.isMySQL80AndMore():
-            self.execute("SET SESSION binlog_row_metadata = 'MINIMAL'")
+        # Check if binlog_row_metadata exists (MySQL 8.0+)
+        try:
+            cursor = self.execute("SHOW GLOBAL VARIABLES LIKE 'binlog_row_metadata'")
+            result = cursor.fetchone()
+            if result:
+                global_binlog_row_metadata = result[1]
+                if global_binlog_row_metadata == 'FULL':
+                    self.skipTest("binlog_row_metadata is FULL globally, use_column_name_cache is not needed")
+            # If result is None, binlog_row_metadata doesn't exist (MySQL 5.7 or older), so proceed
+        except pymysql.err.OperationalError as e:
+            if e.args[0] == 1193:  # ER_UNKNOWN_SYSTEM_VARIABLE
+                # Variable doesn't exist, likely MySQL 5.7 or older, so proceed
+                pass
+            else:
+                raise
 
         query = "CREATE TABLE test_column_cache (id INT NOT NULL AUTO_INCREMENT, data VARCHAR (50) NOT NULL, PRIMARY KEY (id))"
         self.execute(query)
@@ -318,8 +329,6 @@ def test_fetch_column_names_from_schema(self):
 
         # Reset and replay events
         self.resetBinLog()
-        if self.isMySQL80AndMore():
-            self.execute("SET SESSION binlog_row_metadata = 'MINIMAL'")
         self.execute("INSERT INTO test_column_cache (data) VALUES('World')")
         self.execute("COMMIT")
 
@@ -340,8 +349,6 @@ def test_fetch_column_names_from_schema(self):
         self.assertNotIn("data", event.rows[0]["values"])
 
         # cleanup
-        if self.isMySQL80AndMore():
-            self.execute("SET SESSION binlog_row_metadata = 'FULL'")
         row_event._COLUMN_NAME_CACHE.clear()