extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed stall in calendar update from 1.8: remove deleting from egw_api_content_history, which will be droped by 16.1 update, before calendar update is running

Browse Source
This commit is contained in:
Ralf Becker 2016-11-03 13:39:25 +01:00
parent 521de3a23f
commit 77f8b1b698
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/setup/tables_update.inc.php
View File

@ -1992,7 +1992,7 @@ function calendar_upgrade1_8()
} }
/** /**
* Convert bool column cal_deleted with egw_api_content_history table to a unix timestamp * Convert bool column cal_deleted to a unix timestamp
* *
* Using cal_modified as deleted-timestamp, as querying it from SyncML tables creates too many problems (refresh table stops before copying all rows!) * Using cal_modified as deleted-timestamp, as querying it from SyncML tables creates too many problems (refresh table stops before copying all rows!)
* *
@ -2000,12 +2000,6 @@ function calendar_upgrade1_8()
*/ */
function calendar_upgrade1_9_001() function calendar_upgrade1_9_001()
{ {
// delete in the past wrongly created entries for a single recurrence, which mess up the update, beside being wrong anyway
$GLOBALS['egw_setup']->db->delete('egw_api_content_history',array(
'sync_appname' => 'calendar',
"sync_contentid LIKE '%:%'",
), __LINE__, __FILE__);
/* done by RefreshTable() anyway /* done by RefreshTable() anyway
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_deleted',array( $GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_deleted',array(
'type' => 'int', 'type' => 'int',