makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/13303] Speed up migration dependency calculation.
This commit is contained in:
Tristan Darricau 2014-11-07 11:40:40 +01:00
commit b5ddd87c42
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/phpbb/db/migrator.php
View file

@ -58,6 +58,13 @@ class migrator
*/ */
protected $migrations = array(); protected $migrations = array();
/**
* Array of migrations that have been determined to be fulfillable
*
* @var array
*/
protected $fulfillable_migrations = array();
/** /**
* 'name,' 'class,' and 'state' of the last migration run * 'name,' 'class,' and 'state' of the last migration run
* *
@ -653,7 +660,7 @@ class migrator
*/ */
public function unfulfillable($name) public function unfulfillable($name)
{ {
if (isset($this->migration_state[$name])) if (isset($this->migration_state[$name]) || isset($this->fulfillable_migrations[$name]))
{ {
return false; return false;
} }
@ -674,6 +681,7 @@ class migrator
return $unfulfillable; return $unfulfillable;
} }
} }
$this->fulfillable_migrations[$name] = true;
return false; return false;
} }