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

Merge branch '3.1' into 3.2

Browse Source
This commit is contained in:
Daniel Hensby 2016-05-22 11:10:37 +01:00
commit f3cf55074f
No known key found for this signature in database
GPG Key ID: E38EC566FE29EB66
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dev/SapphireTest.php
View File

@ -226,13 +226,9 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
$this->model = DataModel::inst(); $this->model = DataModel::inst();
// Set up fixture // Set up fixture
if($fixtureFile || $this->usesDatabase || !self::using_temp_db()) { if($fixtureFile || $this->usesDatabase) {
if(substr(DB::get_conn()->getSelectedDatabase(), 0, strlen($prefix) + 5) if (!self::using_temp_db()) {
!= strtolower(sprintf('%stmpdb', $prefix))) {
//echo "Re-creating temp database... ";
self::create_temp_db(); self::create_temp_db();
//echo "done.\n";
} }
singleton('DataObject')->flushCache(); singleton('DataObject')->flushCache();