diff --git a/app/controllers/web_migrate.php b/app/controllers/web_migrate.php index af229590f2c2c2e87d17e6fa6bc51caedbc2a5a0..2637578d98d4e82692842f4e41d48453c87b1ae6 100644 --- a/app/controllers/web_migrate.php +++ b/app/controllers/web_migrate.php @@ -17,8 +17,6 @@ class WebMigrateController extends StudipController parent::before_filter($action, $args); - DBSchemaVersion::validateSchemaVersion(); - $this->target = Request::int('target'); $this->branch = Request::get('branch', '0'); $this->version = new DBSchemaVersion('studip', $this->branch); diff --git a/cli/migrate.php b/cli/migrate.php index 0fe6bc35c436d6c5fe44c37c1a926d1451147ad4..618132a8b8255fc0ab8f7dbf51e8f9b835d0daf5 100755 --- a/cli/migrate.php +++ b/cli/migrate.php @@ -53,8 +53,6 @@ if (isset($_SERVER['argv'])) { } } - DBSchemaVersion::validateSchemaVersion(); - $version = new DBSchemaVersion($domain, $branch); $migrator = new Migrator($path, $version, $verbose); diff --git a/lib/migrations/DBSchemaVersion.php b/lib/migrations/DBSchemaVersion.php index 8217ec06edb44cedf2a5b1faa5f00cf50989115a..61894be078755cf46cf40bfac2c0bbb81b3aa035 100644 --- a/lib/migrations/DBSchemaVersion.php +++ b/lib/migrations/DBSchemaVersion.php @@ -45,6 +45,7 @@ class DBSchemaVersion implements SchemaVersion $this->domain = $domain; $this->branch = $branch; $this->versions = [0]; + $this->validateSchemaVersion(); $this->initSchemaInfo(); } @@ -158,7 +159,7 @@ class DBSchemaVersion implements SchemaVersion /** * Validate correct structure of schema_version table. */ - public static function validateSchemaVersion() + private function validateSchemaVersion() { $db = DBManager::get(); $result = $db->query("SHOW TABLES LIKE 'schema_versions'");