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

* PostgreSQL: when importing/updating timezones, only query last insert id, if not already in database (gives warning for PostgreSQL)

Browse Source
This commit is contained in:
Ralf Becker 2011-04-11 16:07:08 +00:00
parent 8f9d3fd95a
commit 3c840294a2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
calendar/inc/class.calendar_timezones.inc.php
View File

@ -232,6 +232,11 @@ class calendar_timezones
$data['alias'] = $tz2id[$data['alias']]; $data['alias'] = $tz2id[$data['alias']];
if (!$data['alias']) continue; // there's no such tzid if (!$data['alias']) continue; // there's no such tzid
} }
// check if already in database
$tz2id[$data['tzid']] = $GLOBALS['egw']->db->select('egw_cal_timezones','tz_id',array(
'tz_tzid' => $data['tzid'],
),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
$GLOBALS['egw']->db->insert('egw_cal_timezones',array( $GLOBALS['egw']->db->insert('egw_cal_timezones',array(
'tz_alias' => $data['alias'], 'tz_alias' => $data['alias'],
'tz_latitude' => $data['latitude'], 'tz_latitude' => $data['latitude'],
@ -241,12 +246,8 @@ class calendar_timezones
'tz_tzid' => $data['tzid'], 'tz_tzid' => $data['tzid'],
),__LINE__,__FILE__,'calendar'); ),__LINE__,__FILE__,'calendar');
if (!($tz2id[$data['tzid']] = $GLOBALS['egw']->db->get_last_insert_id('egw_cal_timezones','tz_id'))) // only query last insert id, if not already in database (gives warning for PostgreSQL)
{ if (!$tz2id[$data['tzid']]) $tz2id[$data['tzid']] = $GLOBALS['egw']->db->get_last_insert_id('egw_cal_timezones','tz_id');
$tz2id[$data['tzid']] = $GLOBALS['egw']->db->select('egw_cal_timezones','tz_id',array(
'tz_tzid' => $data['tzid'],
),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
}
} }
$GLOBALS['egw']->db->insert('egw_config',array('config_value' => $tz_version),array( $GLOBALS['egw']->db->insert('egw_config',array('config_value' => $tz_version),array(
'config_name' => 'tz_version', 'config_name' => 'tz_version',