Skip to content

Revert "Installation goes brrrr" #24060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Nov 11, 2020
Merged

Revert "Installation goes brrrr" #24060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Revert "Installation goes brrrr"
  • Loading branch information
@ChristophWurst
ChristophWurst authored Nov 11, 2020
commit d36155620c8965381acc4e36a2d7e968c36cbc27
46 changes: 0 additions & 46 deletions lib/private/DB/MigrationService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,6 @@ private function createMigrationTable() {
return false;
}

if ($this->connection->tableExists('migrations')) {
$this->migrationTableCreated = true;
return false;
}

$schema = new SchemaWrapper($this->connection);

/**
Expand Down Expand Up @@ -413,54 +408,13 @@ public function setOutput(IOutput $output) {
* @throws \InvalidArgumentException
*/
public function migrate($to = 'latest', $schemaOnly = false) {
if ($schemaOnly) {
$this->migrateSchemaOnly($to);
return;
}

// read known migrations
$toBeExecuted = $this->getMigrationsToExecute($to);
foreach ($toBeExecuted as $version) {
$this->executeStep($version, $schemaOnly);
}
}

/**
* Applies all not yet applied versions up to $to
*
* @param string $to
* @throws \InvalidArgumentException
*/
public function migrateSchemaOnly($to = 'latest') {
// read known migrations
$toBeExecuted = $this->getMigrationsToExecute($to);

if (empty($toBeExecuted)) {
return;
}

$toSchema = null;
foreach ($toBeExecuted as $version) {
$instance = $this->createInstance($version);

$toSchema = $instance->changeSchema($this->output, function () use ($toSchema) {
return $toSchema ?: new SchemaWrapper($this->connection);
}, ['tablePrefix' => $this->connection->getPrefix()]) ?: $toSchema;

$this->markAsExecuted($version);
}

if ($toSchema instanceof SchemaWrapper) {
$targetSchema = $toSchema->getWrappedSchema();
if ($this->checkOracle) {
$beforeSchema = $this->connection->createSchema();
$this->ensureOracleIdentifierLengthLimit($beforeSchema, $targetSchema, strlen($this->connection->getPrefix()));
}
$this->connection->migrateToSchema($targetSchema);
$toSchema->performDropTableCalls();
}
}

/**
* Get the human readable descriptions for the migration steps to run
*
Expand Down
4 changes: 2 additions & 2 deletions lib/private/Installer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public function installApp(string $appId, bool $forceEnable = false): string {
}
} else {
$ms = new \OC\DB\MigrationService($info['id'], \OC::$server->getDatabaseConnection());
$ms->migrate('latest', true);
$ms->migrate();
}
if ($previousVersion) {
OC_App::executeRepairSteps($appId, $info['repair-steps']['post-migration']);
Expand Down Expand Up @@ -589,7 +589,7 @@ public static function installShippedApp($app) {
}
} else {
$ms = new \OC\DB\MigrationService($app, \OC::$server->getDatabaseConnection());
$ms->migrate('latest', true);
$ms->migrate();
}

//run appinfo/install.php
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Setup/AbstractDatabase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,6 @@ public function runMigrations() {
return;
}
$ms = new MigrationService('core', \OC::$server->getDatabaseConnection());
$ms->migrate('latest', true);
$ms->migrate();
}
}