Fixing problem with fixtures in different connection objects

cakephp · Jun 21, 2013 · f61cdcd · f61cdcd
1 parent e3616b5
commit f61cdcd
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/lib/Cake/TestSuite/Fixture/FixtureManager.php b/lib/Cake/TestSuite/Fixture/FixtureManager.php
@@ -194,15 +194,22 @@ public function load(TestCase $test) {
 			return;
 		}
 
+		$dbs = [];
 		foreach ($fixtures as $f) {
 			if (!empty($this->_loaded[$f])) {
 				$fixture = $this->_loaded[$f];
-				$db = ConnectionManager::getDataSource($fixture->connection);
-				$db->begin();
+				$dbs[$fixture->connection][$f] = $fixture;
+			}
+		}
+
+		foreach ($dbs as $db => $fixtures) {
+			$db = ConnectionManager::getDataSource($fixture->connection);
+			$db->begin();
+			foreach ($fixtures as $fixture) {
 				$this->_setupTable($fixture, $db, $test->dropTables);
 				$fixture->insert($db);
-				$db->commit();
 			}
+			$db->commit();
 		}
 	}