tonyair/silverstripe-testsession
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-testsession synced 2024-10-22 14:06:00 +02:00
Code Issues Projects Releases Wiki Activity

FIX Ensure primary connection is updated with temporary database

Browse Source
This commit is contained in:
Steve Boyd 2024-10-03 17:12:35 +13:00
parent 8f4771385c
commit 402a9f931e
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_config.php
View File

@ -12,7 +12,7 @@ TestSessionEnvironment::singleton()->loadFromFile();
*/ */
if (class_exists('Resque_Event') && class_exists('SSResqueRun')) { if (class_exists('Resque_Event') && class_exists('SSResqueRun')) {
Resque_Event::listen('beforeFork', function ($data) { Resque_Event::listen('beforeFork', function ($data) {
$databaseConfig = DB::getConfig(); $databaseConfig = DB::getConfig(DB::CONN_PRIMARY);
// Reconnect to the database - this may connect to the old DB first, but is required because these processes // Reconnect to the database - this may connect to the old DB first, but is required because these processes
// are long-lived, and MySQL connections often get closed in between worker runs. We need to connect before // are long-lived, and MySQL connections often get closed in between worker runs. We need to connect before

20
src/TestSessionEnvironment.php
View File

@ -272,7 +272,7 @@ class TestSessionEnvironment
$this->extend('onBeforeApplyState', $state); $this->extend('onBeforeApplyState', $state);
// back up source // back up source
$databaseConfig = DB::getConfig(); $databaseConfig = DB::getConfig(DB::CONN_PRIMARY);
$this->oldDatabaseName = $databaseConfig['database']; $this->oldDatabaseName = $databaseConfig['database'];
// Load existing state from $this->state into $state, if there is any // Load existing state from $this->state into $state, if there is any
@ -523,9 +523,9 @@ class TestSessionEnvironment
public function resetDatabaseName() public function resetDatabaseName()
{ {
if ($this->oldDatabaseName) { if ($this->oldDatabaseName) {
$databaseConfig = DB::getConfig(); $databaseConfig = DB::getConfig(DB::CONN_PRIMARY);
$databaseConfig['database'] = $this->oldDatabaseName; $databaseConfig['database'] = $this->oldDatabaseName;
DB::setConfig($databaseConfig); DB::setConfig($databaseConfig, DB::CONN_PRIMARY);
$conn = DB::get_conn(); $conn = DB::get_conn();
@ -568,7 +568,7 @@ class TestSessionEnvironment
$state = $this->getState(); $state = $this->getState();
} }
$databaseConfig = DB::getConfig(); $databaseConfig = DB::getConfig(DB::CONN_PRIMARY);
if (isset($state->database) && $state->database) { if (isset($state->database) && $state->database) {
if (!DB::get_conn()) { if (!DB::get_conn()) {
@ -579,14 +579,14 @@ class TestSessionEnvironment
} }
// Connect to database // Connect to database
DB::connect($databaseConfig); $this->connectToDB($databaseConfig);
} else { } else {
// We've already connected to the database, do a fast check to see what database we're currently using // We've already connected to the database, do a fast check to see what database we're currently using
$db = DB::get_conn()->getSelectedDatabase(); $db = DB::get_conn()->getSelectedDatabase();
if (isset($state->database) && $db != $state->database) { if (isset($state->database) && $db != $state->database) {
$this->oldDatabaseName = $databaseConfig['database']; $this->oldDatabaseName = $databaseConfig['database'];
$databaseConfig['database'] = $state->database; $databaseConfig['database'] = $state->database;
DB::connect($databaseConfig); $this->connectToDB($databaseConfig);
} }
} }
} }
@ -622,4 +622,12 @@ class TestSessionEnvironment
return true; return true;
} }
private function connectToDB(array $databaseConfig): void
{
// Ensure we connect the primary connection and not a replica
// which can happen if we use the default value of DB::CONN_DYNAMIC
// and there is a replica database configured
DB::connect($databaseConfig, DB::CONN_PRIMARY);
}
} }