mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/13303] Speed up migration dependency calculation.
This commit is contained in:
@@ -58,6 +58,13 @@ class migrator
|
||||
*/
|
||||
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
|
||||
*
|
||||
@@ -653,7 +660,7 @@ class migrator
|
||||
*/
|
||||
public function unfulfillable($name)
|
||||
{
|
||||
if (isset($this->migration_state[$name]))
|
||||
if (isset($this->migration_state[$name]) || isset($this->fulfillable_migrations[$name]))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -674,6 +681,7 @@ class migrator
|
||||
return $unfulfillable;
|
||||
}
|
||||
}
|
||||
$this->fulfillable_migrations[$name] = true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
Reference in New Issue
Block a user