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

Merge pull request #7699 from nextcloud/bugfix/7528/drop-owncloud-migrations-table-and-recreate-it

Browse source 
Drop the ownCloud migration table instead of reusing it
This commit is contained in:
Morris Jobke 2018-01-04 16:52:52 +01:00 committed by GitHub
commit e7aebcfd6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,7 @@
namespace OC\DB;
use Doctrine\DBAL\Schema\SchemaException;
use OC\IntegrityCheck\Helpers\AppLocator;
use OC\Migration\SimpleOutput;
use OCP\AppFramework\App;
@ -96,9 +97,41 @@ class MigrationService {
return false;
}
if ($this->connection->tableExists('migrations')) {
$this->migrationTableCreated = true;
return false;
$schema = new SchemaWrapper($this->connection);
/**
* We drop the table when it has different columns or the definition does not
* match. E.g. ownCloud uses a length of 177 for app and 14 for version.
*/
try {
$table = $schema->getTable('migrations');
$columns = $table->getColumns();
if (count($columns) === 2) {
try {
$column = $table->getColumn('app');
$schemaMismatch = $column->getLength() !== 255;
if (!$schemaMismatch) {
$column = $table->getColumn('version');
$schemaMismatch = $column->getLength() !== 255;
}
} catch (SchemaException $e) {
// One of the columns is missing
$schemaMismatch = true;
}
if (!$schemaMismatch) {
// Table exists and schema matches: return back!
$this->migrationTableCreated = true;
return false;
}
}
// Drop the table, when it didn't match our expectations.
$this->connection->dropTable($this->connection->getPrefix() . 'migrations');
} catch (SchemaException $e) {
// Table not found, no need to panic, we will create it.
}
$tableName = $this->connection->getPrefix() . 'migrations';