Fix connection uniqueness checks

This logic has been wrong since skip options were added. Refs #603
cakephp · Mar 18, 2023 · e436e18 · e436e18
1 parent 7cdd082
commit e436e18
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/TestSuite/Migrator.php b/src/TestSuite/Migrator.php
@@ -92,13 +92,13 @@ public function runMany(
 
             $options[$i] = $migrationSet;
             $connectionName = $migrationSet['connection'];
-            if (!in_array($connectionName, $connectionsList)) {
-                $connectionsList[] = ['name' => $connectionName, 'skip' => $skip];
+            if (!isset($connectionsList[$connectionName])) {
+                $connectionsList[$connectionName] = ['name' => $connectionName, 'skip' => $skip];
             }
 
             $migrations = new Migrations();
-            if (!in_array($connectionName, $connectionsToDrop) && $this->shouldDropTables($migrations, $migrationSet)) {
-                $connectionsToDrop[] = ['name' => $connectionName, 'skip' => $skip];
+            if (!isset($connectionsToDrop[$connectionName]) && $this->shouldDropTables($migrations, $migrationSet)) {
+                $connectionsToDrop[$connectionName] = ['name' => $connectionName, 'skip' => $skip];
             }
         }
 

diff --git a/tests/TestCase/TestSuite/MigratorTest.php b/tests/TestCase/TestSuite/MigratorTest.php
@@ -115,14 +115,15 @@ public function testRunManyMultipleSkip(): void
         $migrator->runMany([
             ['plugin' => 'Migrator'],
             ['plugin' => 'Migrator', 'source' => 'Migrations2'],
-        ], false);
+        ]);
 
         // Run migrations the second time. Skip clauses will cause problems.
         try {
             $migrator->runMany([
                 ['plugin' => 'Migrator', 'skip' => ['migrator']],
                 ['plugin' => 'Migrator', 'source' => 'Migrations2', 'skip' => ['m*']],
-            ], false);
+            ]);
+            $this->fail('Should fail because of table drops');
         } catch (RuntimeException $e) {
             $connection->getDriver()->disconnect();
             $this->assertStringContainsString('Could not apply migrations', $e->getMessage());