holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use cast only for Postgres, as in projectmanager

Browse Source
This commit is contained in:
Nathan Gray 2010-03-06 15:49:59 +00:00
parent 6008620034
commit 79824c2e0c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/inc/class.calendar_so.inc.php
View File

@ -419,10 +419,18 @@ class calendar_so
{
// allow apps to supply participants and/or icons
if (is_null($_cols)) $cols .= ',NULL AS participants,NULL AS icons';
// For deleted history
$history_id = $this->cal_table.'.cal_id';
// Postgres needs a cast
if($this->db->Type == 'postgres') {
$history_id = "CAST($history_id AS VARCHAR)";
}
// changed the original OR in the query into a union, to speed up the query execution under MySQL 5
$select = array(
'table' => $this->cal_table,
'join' => "JOIN $this->dates_table ON $this->cal_table.cal_id=$this->dates_table.cal_id JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id JOIN egw_api_content_history ON egw_api_content_history.sync_appname = 'calendar' AND CAST(egw_api_content_history.sync_contentid AS UNSIGNED)=$this->cal_table.cal_id",
'join' => "JOIN $this->dates_table ON $this->cal_table.cal_id=$this->dates_table.cal_id JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id JOIN egw_api_content_history ON egw_api_content_history.sync_appname = 'calendar' AND egw_api_content_history.sync_contentid = $history_id",
'cols' => $cols,
'where' => $where,
'app' => 'calendar',