Changeset 7955 for branches

Timestamp:

03/05/13 12:26:10 (11 years ago)

Author:

douglas

Message:

Ticket #3355 - ExpressoCalendar? não funciona a contento em diferentes banco de dados

File:

• branches/2.5/prototype/modules/calendar/schedules.php (modified) (2 diffs)

branches/2.5/prototype/modules/calendar/schedules.php

@@ -54 +54 @@
                 .'AND calendar_object.dtstart NOT IN (SELECT calendar_repeat_occurrence.occurrence from calendar_repeat_occurrence, '
                 .'calendar_repeat where (calendar_repeat_occurrence.repeat_id = calendar_repeat.id) '
-                .'AND (calendar_repeat.object_id = calendar_object.id)) group by calendar_object.id, calendar_to_calendar_object.calendar_id ORDER BY calendar_object.dtstart';
+                .'AND (calendar_repeat.object_id = calendar_object.id)) ' 
+                .'group by 
+                    calendar_object.id, calendar_object.cal_uid, calendar_object.type_id, 
+                    calendar_object.dtstart, calendar_object.summary, calendar_object.description, 
+                    calendar_object.dtend, calendar_object.priority, calendar_object.due, calendar_object.percentage, 
+                    calendar_object.status, calendar_object.location, calendar_object.allday, calendar_object.transp, 
+                    calendar_object.class_id, calendar_object.repeat, calendar_object.range_start, calendar_object.range_end, 
+                    calendar_object.last_update, calendar_object.dtstamp, calendar_object.sequence, 
+                    calendar_object.tzid, calendar_to_calendar_object.calendar_id 
+                ORDER BY 
+                    calendar_object.dtstart'; 
 
         $params = Controller::service('PostgreSQL')->execResultSql($sql.$where);
@@ -82 +92 @@
 
 
-            $where = 'AND (((upper("summary") like upper(\'%'.$summary.'%\') OR upper("description") like upper(\'%'.$description.'%\')))) group by calendar_object.id, calendar_to_calendar_object.calendar_id ORDER BY dtstart LIMIT '.$limit.'  OFFSET '.$offset.' ';
+            $where = 'AND (((upper("summary") like upper(\'%'.$summary.'%\') OR upper("description") like upper(\'%'.$description.'%\')))) 
+                group by 
+                    calendar_object.id, calendar_object.cal_uid, calendar_object.type_id, 
+                    calendar_object.dtstart, calendar_object.summary, calendar_object.description, 
+                    calendar_object.dtend, calendar_object.priority, calendar_object.due, calendar_object.percentage, 
+                    calendar_object.status, calendar_object.location, calendar_object.allday, calendar_object.transp, 
+                    calendar_object.class_id, calendar_object.repeat, calendar_object.range_start, calendar_object.range_end, 
+                    calendar_object.last_update, calendar_object.dtstamp, calendar_object.sequence, 
+                    calendar_object.tzid, calendar_to_calendar_object.calendar_id 
+                ORDER BY 
+                    dtstart LIMIT '.$limit.'  OFFSET '.$offset.' '; 
+ 
             $params = Controller::service('PostgreSQL')->execResultSql($sql.$where);