wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #10298 from nextcloud/bugfix/talk-714/only-migrate-the-schema-when-moving-database

Browse source 
Only create the schema when moving between databases
This commit is contained in:
Morris Jobke 2018-07-24 16:14:05 +02:00 committed by GitHub
commit 7da815bb04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/Command/Db/ConvertType.php
View file

@ -245,7 +245,7 @@ class ConvertType extends Command implements CompletionAwareInterface {
$currentMigration = $fromMS->getMigration('current');
if ($currentMigration !== '0') {
$toMS = new MigrationService($app, $toDB);
$toMS->migrate($currentMigration);
$toMS->migrate($currentMigration, true);
}
}
}

24
lib/private/DB/MigrationService.php
View file

@ -376,13 +376,14 @@ class MigrationService {
* Applies all not yet applied versions up to $to
*
* @param string $to
* @param bool $schemaOnly
* @throws \InvalidArgumentException
*/
public function migrate($to = 'latest') {
public function migrate($to = 'latest', $schemaOnly = false) {
// read known migrations
$toBeExecuted = $this->getMigrationsToExecute($to);
foreach ($toBeExecuted as $version) {
$this->executeStep($version);
$this->executeStep($version, $schemaOnly);
}
}
@ -432,14 +433,17 @@ class MigrationService {
* Executes one explicit version
*
* @param string $version
* @param bool $schemaOnly
* @throws \InvalidArgumentException
*/
public function executeStep($version) {
public function executeStep($version, $schemaOnly = false) {
$instance = $this->createInstance($version);
$instance->preSchemaChange($this->output, function() {
return new SchemaWrapper($this->connection);
}, ['tablePrefix' => $this->connection->getPrefix()]);
if (!$schemaOnly) {
$instance->preSchemaChange($this->output, function() {
return new SchemaWrapper($this->connection);
}, ['tablePrefix' => $this->connection->getPrefix()]);
}
$toSchema = $instance->changeSchema($this->output, function() {
return new SchemaWrapper($this->connection);
@ -450,9 +454,11 @@ class MigrationService {
$toSchema->performDropTableCalls();
}
$instance->postSchemaChange($this->output, function() {
return new SchemaWrapper($this->connection);
}, ['tablePrefix' => $this->connection->getPrefix()]);
if (!$schemaOnly) {
$instance->postSchemaChange($this->output, function() {
return new SchemaWrapper($this->connection);
}, ['tablePrefix' => $this->connection->getPrefix()]);
}
$this->markAsExecuted($version);
}