diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-07 22:42:42 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-07 22:42:42 +0200 |
| commit | 6c6916dc7dc9233e60823013c96cab38cd930406 (patch) | |
| tree | f7eb6166a2aaf44d01d369f89b2ee02941fc0dd8 /phpBB/phpbb/db | |
| parent | b2d73922c6ca9a22cb3c25c3f9fa615028d2f1be (diff) | |
| parent | 44a9bfc07142a023e7e5f62245f2665be9f09359 (diff) | |
| download | forums-6c6916dc7dc9233e60823013c96cab38cd930406.tar forums-6c6916dc7dc9233e60823013c96cab38cd930406.tar.gz forums-6c6916dc7dc9233e60823013c96cab38cd930406.tar.bz2 forums-6c6916dc7dc9233e60823013c96cab38cd930406.tar.xz forums-6c6916dc7dc9233e60823013c96cab38cd930406.zip | |
Merge remote-tracking branch 'Marc/ticket/12362' into develop-ascraeus
* Marc/ticket/12362:
[ticket/12362] Do not use database test case as it's not needed
[ticket/12362] Add tests for schema generator
[ticket/12362] Throw exception in schema generator on unresolvable dependency
Diffstat (limited to 'phpBB/phpbb/db')
| -rw-r--r-- | phpBB/phpbb/db/migration/schema_generator.php | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/schema_generator.php b/phpBB/phpbb/db/migration/schema_generator.php index a7e2fa8f06..dbb50e80ca 100644 --- a/phpBB/phpbb/db/migration/schema_generator.php +++ b/phpBB/phpbb/db/migration/schema_generator.php @@ -40,6 +40,9 @@ class schema_generator /** @var array */ protected $tables; + /** @var array */ + protected $dependencies = array(); + /** * Constructor */ @@ -69,11 +72,13 @@ class schema_generator $migrations = $this->class_names; $tree = array(); + $check_dependencies = true; while (!empty($migrations)) { foreach ($migrations as $migration_class) { $open_dependencies = array_diff($migration_class::depends_on(), $tree); + if (empty($open_dependencies)) { $migration = new $migration_class($this->config, $this->db, $this->db_tools, $this->phpbb_root_path, $this->php_ext, $this->table_prefix); @@ -170,10 +175,41 @@ class schema_generator } unset($migrations[$migration_key]); } + else if ($check_dependencies) + { + $this->dependencies = array_merge($this->dependencies, $open_dependencies); + } + } + + // Only run this check after the first run + if ($check_dependencies) + { + $this->check_dependencies(); + $check_dependencies = false; } } ksort($this->tables); return $this->tables; } + + /** + * Check if one of the migrations files' dependencies can't be resolved + * by the supplied list of migrations + * + * @throws UnexpectedValueException If a dependency can't be resolved + */ + protected function check_dependencies() + { + // Strip duplicate values from array + $this->dependencies = array_unique($this->dependencies); + + foreach ($this->dependencies as $dependency) + { + if (!in_array($dependency, $this->class_names)) + { + throw new \UnexpectedValueException("Unable to resolve the dependency '$dependency'"); + } + } + } } |