nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-25 02:34:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rewrite time-range SQL clauses for greater clarity.

Browse Source
This commit is contained in:
Andrew McMillan 2011-09-19 12:34:26 +12:00
parent b569f93858
commit d6524a87f4
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
inc/caldav-REPORT-calquery.php
View File

@ -146,22 +146,21 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
// $params[':time_range_start'] = $start; // $params[':time_range_start'] = $start;
// $params[':time_range_end'] = $finish; // $params[':time_range_end'] = $finish;
// } // }
if ( isset($start) && isset($finish) ) { $start_sql = $finish_sql = '';
$sql .= ' AND (rrule IS NOT NULL OR dtstart IS NULL'; if ( isset($start) ) {
$sql .= ' OR (dtstart < :time_range_end AND (dtend > :time_range_start OR (dtend IS NULL AND dtstart > :time_range_start))))';
$params[':time_range_start'] = $start; $params[':time_range_start'] = $start;
$params[':time_range_end'] = $finish; $start_sql .= ' ((dtend IS NULL AND dtstart > :time_range_start) OR dtend > :time_range_start) ';
} }
elseif ( isset($start) ) { if ( isset($finish) ) {
$sql .= ' AND (rrule IS NOT NULL OR dtstart IS NULL';
$sql .= ' OR (dtend IS NULL AND dtstart > :time_range_start)';
$sql .= ' OR dtend > :time_range_start) ';
$params[':time_range_start'] = $start;
}
elseif ( isset($finish) ) {
$sql .= ' AND (rrule IS NOT NULL OR dtstart IS NULL';
$sql .= ' OR dtstart < :time_range_end) ';
$params[':time_range_end'] = $finish; $params[':time_range_end'] = $finish;
$finish_sql = ' dtstart < :time_range_end ';
}
if ( isset($start) || isset($finish) ) {
$sql .= ' AND (rrule IS NOT NULL OR dtstart IS NULL OR (';
if ( isset($start) ) $sql .= $start_sql;
if ( isset($start) && isset($finish) ) $sql .= ' AND ';
if ( isset($finish) ) $sql .= $finish_sql;
$sql .= '))';
} }
$need_range_filter = array(new RepeatRuleDateTime($start),new RepeatRuleDateTime($finish)); $need_range_filter = array(new RepeatRuleDateTime($start),new RepeatRuleDateTime($finish));
break; break;