Fix index error #2

Author: bakwc

mysql_ch_replicator/converter.py

@@ -530,11 +530,20 @@ def get_db_and_table_name(self, token, db_name):
             table_name = token
         db_name = strip_sql_name(db_name)
         table_name = strip_sql_name(table_name)
+
         if self.db_replicator:
-            # Check if database and table match config BEFORE applying mapping
-            matches_config = (
-                self.db_replicator.config.is_database_matches(db_name)
-                and self.db_replicator.config.is_table_matches(table_name))
+            # If we're dealing with a relative table name (no DB prefix), we need to check
+            # if the current db_name is already a target database name
+            if '.' not in token and self.db_replicator.target_database == db_name:
+                # This is a target database name, so for config matching we need to use the source database
+                matches_config = (
+                    self.db_replicator.config.is_database_matches(self.db_replicator.database)
+                    and self.db_replicator.config.is_table_matches(table_name))
+            else:
+                # Normal case: check if source database and table match config
+                matches_config = (
+                    self.db_replicator.config.is_database_matches(db_name)
+                    and self.db_replicator.config.is_table_matches(table_name))
 
             # Apply database mapping AFTER checking matches_config
             if db_name == self.db_replicator.database:

test_mysql_ch_replicator.py

@@ -2280,6 +2280,9 @@ def test_schema_evolution_with_db_mapping():
         clickhouse_settings=cfg.clickhouse,
     )
 
+    ch.drop_database("mapped_target_db")
+    assert_wait(lambda: "mapped_target_db" not in ch.get_databases())
+
     prepare_env(cfg, mysql, ch, db_name=TEST_DB_NAME)
 
     # Create a test table with some columns using fully qualified name
@@ -2430,9 +2433,6 @@ def test_dynamic_column_addition_user_config():
     # This would have caused an error before our fix
     mysql.execute("UPDATE test_replication.replication_data SET val_2 = '100' WHERE code = 'test-1';", commit=True)
 
-    # Give some time for the replication to process the update
-    time.sleep(5)
-    
     # Verify replication processes are still running
     binlog_pid = get_binlog_replicator_pid(cfg)
     db_pid = get_db_replicator_pid(cfg, "test_replication")