tonyair
/
silverstripe-testsession
mirror of https://github.com/silverstripe/silverstripe-testsession
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Skip Temp DB creation if state has no database prop

This commit is contained in:
Bernard Hamlin 2019-03-13 09:16:31 +13:00
parent 61d12ec08a
commit 34100aa767
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/TestSessionEnvironment.php
View File

@ -288,6 +288,7 @@ class TestSessionEnvironment
// Database
if (!$this->isRunningTests()) {
$dbCreate = isset($state->createDatabase) ? (bool) $state->createDatabase : false;
$dbName = (isset($state->database)) ? $state->database : null;
if ($dbName) {
@ -296,7 +297,7 @@ class TestSessionEnvironment
$dbExists = false;
}
if (!$dbExists) {
if (!$dbExists && $dbCreate) {
// Create a new one with a randomized name
$tempDB = new TempDatabase();
$dbName = $tempDB->build();
@ -310,7 +311,6 @@ class TestSessionEnvironment
throw new InvalidArgumentException("Invalid database name format");
}
$this->oldDatabaseName = $databaseConfig['database'];
$databaseConfig['database'] = $dbName; // Instead of calling DB::set_alternative_db_name();
// Connect to the new database, overwriting the old DB connection (if any)