fixed update-file, update from stable was running the phpgw_async changes twice, reported by Andy

This commit is contained in:
Ralf Becker 2004-08-26 14:15:55 +00:00
parent 2c62ea94b9
commit 9673ed9a05

View File

@ -22,14 +22,7 @@
$test[] = '1.0.0.001'; $test[] = '1.0.0.001';
function phpgwapi_upgrade1_0_0_001() function phpgwapi_upgrade1_0_0_001()
{ {
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','id','async_id'); $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.0.004';
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','next','async_next');
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','times','async_times');
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','method','async_method');
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','data','async_data');
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','account_id','async_account_id');
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.001';
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
} }
@ -50,10 +43,14 @@
$test[] = '1.0.0.004'; $test[] = '1.0.0.004';
function phpgwapi_upgrade1_0_0_004() function phpgwapi_upgrade1_0_0_004()
{ {
phpgwapi_upgrade1_0_0_001(); $GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','id','async_id');
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','next','async_next');
// we skip the 1.0.1.001 update as its identitcal to the 1.0.0.003 update, which we already have $GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','times','async_times');
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.002'; $GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','method','async_method');
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','data','async_data');
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_async','account_id','async_account_id');
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.001';
return $GLOBALS['setup_info']['phpgwapi']['currentver']; return $GLOBALS['setup_info']['phpgwapi']['currentver'];
} }