Permalink
Browse files

merge r16312 from branch 2.4 to trunk

bug 2677 fixed: smarter check of the database version and manage partial upgrade.



git-svn-id: http://piwigo.org/svn/trunk@16313 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information...
plegall committed Jul 2, 2012
1 parent 39d5409 commit 52fa0fed5e4a63c63464d4f630db97a0a2e024a1
Showing with 30 additions and 8 deletions.
  1. +10 −3 install/upgrade_2.3.0.php
  2. +20 −5 upgrade.php
@@ -52,7 +52,7 @@
$inserts = array();
foreach ($to_apply as $upgrade_id)
{
if ($upgrade_id >= 98)
if ($upgrade_id >= 112) // TODO change on each release
{
break;
}
@@ -83,11 +83,18 @@
ob_start();
echo '<pre>';
for ($upgrade_id = 112; $upgrade_id <= 127; $upgrade_id++)
for ($upgrade_id = 112; $upgrade_id <= 127; $upgrade_id++) // TODO change on each release
{
if (!file_exists(UPGRADES_PATH.'/'.$upgrade_id.'-database.php'))
{
break;
continue;
}
// maybe the upgrade task has already been applied in a previous and
// incomplete upgrade
if (in_array($upgrade_id, $applied))
{
continue;
}
unset($upgrade_description);
@@ -322,13 +322,28 @@ function print_time($message)
{
$current_release = '2.2.0';
}
else if (!in_array('coi', $columns_of[PREFIX_TABLE.'images']))
{
$current_release = '2.3.0';
}
else
{
die('No upgrade required, the database structure is up to date');
// retrieve already applied upgrades
$query = '
SELECT id
FROM '.PREFIX_TABLE.'upgrade
;';
$applied_upgrades = array_from_query($query, 'id');
if (!in_array(127, $applied_upgrades))
{
$current_release = '2.3.0';
}
else
{
// confirm that the database is in the same version as source code files
conf_update_param('piwigo_db_version', get_branch_from_version(PHPWG_VERSION));
echo 'No upgrade required, the database structure is up to date';
echo '<br><a href="index.php">← back to gallery</a>';
exit();
}
}
// +-----------------------------------------------------------------------+

0 comments on commit 52fa0fe

Please sign in to comment.