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

Merge pull request #24 from IgorNadj/patch-1 

ENH: allow specify database by filename
This commit is contained in:
Ingo Schommer 2015-10-18 14:09:59 +13:00
parent 0025923e3a 5c08aa9248
commit c5e9f33531
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
code/TestSessionController.php
View File

@ -94,9 +94,24 @@ class TestSessionController extends Controller {
$this->environment->startTestSession($params, $id);
// Optionally import database
if(!empty($params['importDatabasePath'])) {
if(!empty($params['importDatabasePath']) || !empty($params['importDatabaseFilename'])) {
$absPath = '';
// by path
if(!empty($params['importDatabasePath'])) {
$absPath = $params['importDatabasePath'];
// by filename
}else if(!empty($params['importDatabaseFilename'])) {
foreach($this->getDatabaseTemplates() as $tAbsPath => $tFilename){
if($tFilename === $params['importDatabaseFilename']){
$absPath = $tAbsPath;
break;
}
}
}
$this->environment->importDatabase(
$params['importDatabasePath'],
$absPath,
!empty($params['requireDefaultRecords']) ? $params['requireDefaultRecords'] : false
);
} else if(!empty($params['requireDefaultRecords']) && $params['requireDefaultRecords']) {
@ -377,4 +392,4 @@ class TestSessionController extends Controller {
return $params;
}
}
}