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

Merge pull request #8878 from owncloud/update-checkmigrationforapps 

Simulate apps database schema update on upgrade
This commit is contained in:
Vincent Petry 2014-06-05 10:28:30 +02:00
parent ff3ded6cb2 95fda3c17c
commit 71b86136c2
8 changed files with 127 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/ajax/update.php
View File

@ -15,6 +15,9 @@ if (OC::checkUpgrade(false)) {
$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
$eventSource->send('success', (string)$l->t('Updated database'));
});
$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($eventSource, $l) {
$eventSource->send('success', (string)$l->t('Checked database schema update'));
});
$updater->listen('\OC\Updater', 'disabledApps', function ($appList) use ($eventSource, $l) {
$list = array();
foreach ($appList as $appId) {

3
core/command/upgrade.php
View File

@ -56,6 +56,9 @@ class Upgrade extends Command {
$updater->listen('\OC\Updater', 'dbUpgrade', function () use($output) {
$output->writeln('<info>Updated database</info>');
});
$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use($output) {
$output->writeln('<info>Checked database schema update</info>');
});
$updater->listen('\OC\Updater', 'disabledApps', function ($appList) use($output) {
$output->writeln('<info>Disabled incompatible apps: ' . implode(', ', $appList) . '</info>');
});

2
core/js/update.js
View File

@ -28,7 +28,7 @@
this.addMessage(t(
'core',
'Updating {productName} to version {version}, this may take a while.', {
productName: OC.theme.name,
productName: OC.theme.name || 'ownCloud',
version: OC.config.versionstring
}),
'bold'

2
lib/base.php
View File

@ -730,7 +730,7 @@ class OC {
if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) {
try {
if (!OC_Config::getValue('maintenance', false)) {
if (!OC_Config::getValue('maintenance', false) && !self::needUpgrade()) {
OC_App::loadApps();
}
self::checkSingleUserMode();

29
lib/private/app.php
View File

@ -875,6 +875,18 @@ class OC_App {
}
}
public static function shouldUpgrade($app) {
$versions = self::getAppVersions();
$currentVersion = OC_App::getAppVersion($app);
if ($currentVersion) {
$installedVersion = $versions[$app];
if (version_compare($currentVersion, $installedVersion, '>')) {
return true;
}
}
return false;
}
/**
* check if the app needs updating and update when needed
*
@ -885,15 +897,18 @@ class OC_App {
return;
}
self::$checkedApps[] = $app;
if (!self::shouldUpgrade($app)) {
return;
}
$versions = self::getAppVersions();
$currentVersion = OC_App::getAppVersion($app);
if ($currentVersion) {
$installedVersion = $versions[$app];
if (version_compare($currentVersion, $installedVersion, '>')) {
$info = self::getAppInfo($app);
OC_Log::write($app,
$currentVersion = OC_App::getAppVersion($app);
OC_Log::write(
$app,
'starting app upgrade from ' . $installedVersion . ' to ' . $currentVersion,
OC_Log::DEBUG);
OC_Log::DEBUG
);
$info = self::getAppInfo($app);
try {
OC_App::updateApp($app);
OC_Hook::emit('update', 'success', 'Updated ' . $info['name'] . ' app');
@ -904,8 +919,6 @@ class OC_App {
}
OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app));
}
}
}
/**
* check if the current enabled apps are compatible with the current

17
lib/private/db.php
View File

@ -321,6 +321,23 @@ class OC_DB {
return $result;
}
/**
* simulate the database schema update
* @param string $file file to read structure from
* @throws Exception
* @return string|boolean
*/
public static function simulateUpdateDbFromStructure($file) {
$schemaManager = self::getMDB2SchemaManager();
try {
$result = $schemaManager->simulateUpdateDbFromStructure($file);
} catch (Exception $e) {
OC_Log::write('core', 'Simulated database structure update failed ('.$e.')', OC_Log::FATAL);
throw $e;
}
return $result;
}
/**
* drop a table - the database prefix will be prepended
* @param string $tableName the table to drop

28
lib/private/db/mdb2schemamanager.php
View File

@ -73,6 +73,17 @@ class MDB2SchemaManager {
}
}
/**
* Reads database schema from file
*
* @param string $file file to read from
*/
private function readSchemaFromFile($file) {
$platform = $this->conn->getDatabasePlatform();
$schemaReader = new MDB2SchemaReader(\OC_Config::getObject(), $platform);
return $schemaReader->loadSchemaFromFile($file);
}
/**
* update the database scheme
* @param string $file file to read structure from
@ -80,21 +91,28 @@ class MDB2SchemaManager {
* @return string|boolean
*/
public function updateDbFromStructure($file, $generateSql = false) {
$platform = $this->conn->getDatabasePlatform();
$schemaReader = new MDB2SchemaReader(\OC_Config::getObject(), $platform);
$toSchema = $schemaReader->loadSchemaFromFile($file);
$toSchema = $this->readSchemaFromFile($file);
$migrator = $this->getMigrator();
if ($generateSql) {
return $migrator->generateChangeScript($toSchema);
} else {
$migrator->checkMigrate($toSchema);
$migrator->migrate($toSchema);
return true;
}
}
/**
* update the database scheme
* @param string $file file to read structure from
* @return string|boolean
*/
public function simulateUpdateDbFromStructure($file) {
$toSchema = $this->readSchemaFromFile($file);
$migrator = $this->getMigrator()->checkMigrate($toSchema);
return true;
}
/**
* @param \Doctrine\DBAL\Schema\Schema $schema
* @return string

34
lib/private/updater.php
View File

@ -125,14 +125,44 @@ class Updater extends BasicEmitter {
* STOP CONFIG CHANGES FOR OLDER VERSIONS
*/
$canUpgrade = false;
// simulate DB upgrade
try {
// simulate core DB upgrade
\OC_DB::simulateUpdateDbFromStructure(\OC::$SERVERROOT . '/db_structure.xml');
// simulate apps DB upgrade
$version = \OC_Util::getVersion();
$apps = \OC_App::getEnabledApps();
foreach ($apps as $appId) {
$info = \OC_App::getAppInfo($appId);
if (\OC_App::isAppCompatible($version, $info) && \OC_App::shouldUpgrade($appId)) {
if (file_exists(\OC_App::getAppPath($appId) . '/appinfo/database.xml')) {
\OC_DB::simulateUpdateDbFromStructure(\OC_App::getAppPath($appId) . '/appinfo/database.xml');
}
}
}
$this->emit('\OC\Updater', 'dbSimulateUpgrade');
$canUpgrade = true;
} catch (\Exception $exception) {
$this->emit('\OC\Updater', 'failure', array($exception->getMessage()));
}
if ($canUpgrade) {
// proceed with real upgrade
try {
// do the real upgrade
\OC_DB::updateDbFromStructure(\OC::$SERVERROOT . '/db_structure.xml');
$this->emit('\OC\Updater', 'dbUpgrade');
} catch (\Exception $exception) {
$this->emit('\OC\Updater', 'failure', array($exception->getMessage()));
return false;
}
// TODO: why not do this at the end ?
\OC_Config::setValue('version', implode('.', \OC_Util::getVersion()));
$disabledApps = \OC_App::checkAppsRequirements();
if (!empty($disabledApps)) {
@ -146,8 +176,12 @@ class Updater extends BasicEmitter {
//Invalidate update feed
\OC_Appconfig::setValue('core', 'lastupdatedat', 0);
}
\OC_Config::setValue('maintenance', false);
$this->emit('\OC\Updater', 'maintenanceEnd');
return $canUpgrade;
}
}