extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-05 05:29:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

improved 1.9.006/7 update-scripts for PostgreSQL: removed stray bracket and drop NULL and default at the end, thanks to feedback from Anthony Messina

Browse Source
This commit is contained in:
Ralf Becker 2012-09-25 07:12:52 +00:00
parent b3d463631a
commit f9ff1e2a5f
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2169,13 +2169,6 @@ function calendar_upgrade1_9_006()
'default' => '0', // PostgreSQL needs a temporary default, to create a nullable column! 'default' => '0', // PostgreSQL needs a temporary default, to create a nullable column!
'comment' => 'startdate (of range)' 'comment' => 'startdate (of range)'
)); ));
// now we can remove temporary default of 0 from range_start
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','range_start',array(
'type' => 'int',
'precision' => '8',
'nullable' => False,
'comment' => 'startdate (of range)'
));
$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET range_start = (SELECT MIN(cal_start) FROM egw_cal_dates WHERE egw_cal_dates.cal_id=egw_cal.cal_id)', __LINE__, __FILE__); $GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET range_start = (SELECT MIN(cal_start) FROM egw_cal_dates WHERE egw_cal_dates.cal_id=egw_cal.cal_id)', __LINE__, __FILE__);
$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','range_end',array( $GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','range_end',array(
@ -2192,7 +2185,7 @@ function calendar_upgrade1_9_006()
} }
else // PostgreSQL, MsSQL, ... else // PostgreSQL, MsSQL, ...
{ {
$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET range_end=recur_enddate FROM egw_cal_repeats WHERE egw_cal.cal_id=egw_cal_repeats.cal_id)', __LINE__, __FILE__); $GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET range_end=recur_enddate FROM egw_cal_repeats WHERE egw_cal.cal_id=egw_cal_repeats.cal_id', __LINE__, __FILE__);
} }
$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats',array( $GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats',array(
'fd' => array( 'fd' => array(
@ -2211,7 +2204,7 @@ function calendar_upgrade1_9_006()
} }
/** /**
* Delete all broken events having range_start=0 (not a single recurrence or a broken one with cal_start=0) * Delete all broken events having range_start=0 or NULL (not a single recurrence or a broken one with cal_start=0)
* *
* They are not displayed in regular calendar anyway, but might be synced to CalDAV or eSync clients. * They are not displayed in regular calendar anyway, but might be synced to CalDAV or eSync clients.
*/ */
@ -2221,7 +2214,15 @@ function calendar_upgrade1_9_007()
{ {
$GLOBALS['egw_setup']->db->query("DELETE FROM $table WHERE cal_id IN (SELECT cal_id FROM egw_cal WHERE range_start=0)"); $GLOBALS['egw_setup']->db->query("DELETE FROM $table WHERE cal_id IN (SELECT cal_id FROM egw_cal WHERE range_start=0)");
} }
$GLOBALS['egw_setup']->db->query("DELETE FROM egw_cal WHERE range_start=0"); $GLOBALS['egw_setup']->db->query("DELETE FROM egw_cal WHERE range_start=0 OR range_start IS NULL");
// now we can remove temporary default of 0 from range_start and set it NOT NULL
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','range_start',array(
'type' => 'int',
'precision' => '8',
'nullable' => False,
'comment' => 'startdate (of range)'
));
return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.008'; return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.008';
} }