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

Merge pull request #61 from webbuilders-group/db-reconnect-fix

Browse Source 
BUGFIX: Fixed issue where the incorrect database connection could be made when using a stubfile
This commit is contained in:
Serge Latyntsev 2019-02-01 14:49:01 +13:00 committed by GitHub
commit 61d12ec08a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/TestSessionEnvironment.php
View File

@ -284,26 +284,7 @@ class TestSessionEnvironment
} }
// ensure we have a connection to the database // ensure we have a connection to the database
if (isset($state->database) && $state->database) { $this->connectToDatabase($state);
if (!DB::get_conn()) {
// No connection, so try and connect to tmpdb if it exists
if (isset($state->database)) {
$this->oldDatabaseName = $databaseConfig['database'];
$databaseConfig['database'] = $state->database;
}
// Connect to database
DB::connect($databaseConfig);
} else {
// We've already connected to the database, do a fast check to see what database we're currently using
$db = DB::get_conn()->getSelectedDatabase();
if (isset($state->database) && $db != $state->database) {
$this->oldDatabaseName = $databaseConfig['database'];
$databaseConfig['database'] = $state->database;
DB::connect($databaseConfig);
}
}
}
// Database // Database
if (!$this->isRunningTests()) { if (!$this->isRunningTests()) {
@ -562,6 +543,39 @@ class TestSessionEnvironment
return PUBLIC_PATH . DIRECTORY_SEPARATOR . 'assets_backup'; return PUBLIC_PATH . DIRECTORY_SEPARATOR . 'assets_backup';
} }
/**
* Ensure that there is a connection to the database
*
* @param mixed $state
*/
public function connectToDatabase($state = null) {
if ($state == null) {
$state = $this->getState();
}
$databaseConfig = DB::getConfig();
if (isset($state->database) && $state->database) {
if (!DB::get_conn()) {
// No connection, so try and connect to tmpdb if it exists
if (isset($state->database)) {
$this->oldDatabaseName = $databaseConfig['database'];
$databaseConfig['database'] = $state->database;
}
// Connect to database
DB::connect($databaseConfig);
} else {
// We've already connected to the database, do a fast check to see what database we're currently using
$db = DB::get_conn()->getSelectedDatabase();
if (isset($state->database) && $db != $state->database) {
$this->oldDatabaseName = $databaseConfig['database'];
$databaseConfig['database'] = $state->database;
DB::connect($databaseConfig);
}
}
}
}
/** /**
* Wait for pending requests * Wait for pending requests

6
src/TestSessionHTTPMiddleware.php
View File

@ -80,10 +80,8 @@ class TestSessionHTTPMiddleware implements HTTPMiddleware
$file = $testState->stubfile; $file = $testState->stubfile;
if (!Director::isLive() && $file && file_exists($file)) { if (!Director::isLive() && $file && file_exists($file)) {
// Connect to the database so the included code can interact with it // Connect to the database so the included code can interact with it
$databaseConfig = DB::getConfig(); $this->testSessionEnvironment->connectToDatabase();
if ($databaseConfig) {
DB::connect($databaseConfig);
}
include_once($file); include_once($file);
} }
} }