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

BUG Infinite loops in TempDatabase (fixes #8902)

Browse Source 
Ugly, but so is the original implementation that this works around (swallowing an exception to trigger functionality)
This commit is contained in:
Ingo Schommer 2020-04-08 13:58:02 +12:00
parent bcab982aa7
commit 052c5cbc38
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ORM/Connect/TempDatabase.php
View File

@ -24,6 +24,13 @@ class TempDatabase
*/ */
protected $name = null; protected $name = null;
/**
* Workaround to avoid infinite loops.
*
* @var Exception
*/
private $skippedException = null;
/** /**
* Optionally remove the test DB when the PHP process exits * Optionally remove the test DB when the PHP process exits
* *
@ -293,6 +300,13 @@ class TempDatabase
try { try {
$this->rebuildTables($extraDataObjects); $this->rebuildTables($extraDataObjects);
} catch (DatabaseException $ex) { } catch (DatabaseException $ex) {
// Avoid infinite loops
if ($this->skippedException && $this->skippedException->getMessage() == $ex->getMessage()) {
throw $ex;
}
$this->skippedException = $ex;
// In case of error during build force a hard reset // In case of error during build force a hard reset
// e.g. pgsql doesn't allow schema updates inside transactions // e.g. pgsql doesn't allow schema updates inside transactions
$this->kill(); $this->kill();