mirror of
https://github.com/silverstripe/silverstripe-testsession
synced 2024-10-22 14:06:00 +02:00
Merge pull request #24 from IgorNadj/patch-1
ENH: allow specify database by filename
This commit is contained in:
commit
c5e9f33531
@ -94,9 +94,24 @@ class TestSessionController extends Controller {
|
|||||||
$this->environment->startTestSession($params, $id);
|
$this->environment->startTestSession($params, $id);
|
||||||
|
|
||||||
// Optionally import database
|
// Optionally import database
|
||||||
|
if(!empty($params['importDatabasePath']) || !empty($params['importDatabaseFilename'])) {
|
||||||
|
$absPath = '';
|
||||||
|
|
||||||
|
// by path
|
||||||
if(!empty($params['importDatabasePath'])) {
|
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(
|
$this->environment->importDatabase(
|
||||||
$params['importDatabasePath'],
|
$absPath,
|
||||||
!empty($params['requireDefaultRecords']) ? $params['requireDefaultRecords'] : false
|
!empty($params['requireDefaultRecords']) ? $params['requireDefaultRecords'] : false
|
||||||
);
|
);
|
||||||
} else if(!empty($params['requireDefaultRecords']) && $params['requireDefaultRecords']) {
|
} else if(!empty($params['requireDefaultRecords']) && $params['requireDefaultRecords']) {
|
||||||
|
Loading…
Reference in New Issue
Block a user