mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure the migrations table schema is always checked 

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Revert "Make sure the migrations table schema is always checked"

This reverts commit 258955ef738a52d9da2ac2fe59466e6093d7e9bc.

Set current vendor during upgrade and perform migrations table change if needed

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2020-12-09 10:10:51 +01:00
parent 0207be4c79
commit b84bdb1080
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/DB/MigrationService.php
View File

@ -124,6 +124,11 @@ class MigrationService {
return false; return false;
} }
if ($this->connection->tableExists('migrations') && \OC::$server->getConfig()->getAppValue('core', 'vendor', '') !== 'owncloud') {
$this->migrationTableCreated = true;
return false;
}
$schema = new SchemaWrapper($this->connection); $schema = new SchemaWrapper($this->connection);
/** /**

1
lib/private/Updater.php
View File

@ -197,6 +197,7 @@ class Updater extends BasicEmitter {
isset($allowedPreviousVersions['owncloud'][$majorMinor]) isset($allowedPreviousVersions['owncloud'][$majorMinor])
)) { )) {
$currentVendor = 'owncloud'; $currentVendor = 'owncloud';
$this->config->setAppValue('core', 'vendor', $currentVendor);
} }
if ($currentVendor === 'nextcloud') { if ($currentVendor === 'nextcloud') {