Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cc-4347: Fixed missing AND clause

This commit is contained in:
Rudi Grinberg 2012-09-07 17:23:32 -04:00
parent b4748a3b1f
commit f1487ba69d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
airtime_mvc/application/models/Show.php
View File

@ -1638,9 +1638,11 @@ SQL;
':end' => $end_string ), 'all'); ':end' => $end_string ), 'all');
} else { } else {
$sql .= " AND ((si1.starts >= :start1::TIMESTAMP AND si1.starts < :end1::TIMESTAMP) $sql .= " ". <<<SQL
OR (si1.ends > :start2::TIMESTAMP si1.ends <= :end2::TIMESTAMP) AND ((si1.starts >= :start1::TIMESTAMP AND si1.starts < :end1::TIMESTAMP)
OR (si1.starts <= :start3::TIMESTAMP AND si1.ends >= :end3::TIMESTAMP))"; OR (si1.ends > :start2::TIMESTAMP AND si1.ends <= :end2::TIMESTAMP)
OR (si1.starts <= :start3::TIMESTAMP AND si1.ends >= :end3::TIMESTAMP))
SQL;
return Application_Common_Database::prepareAndExecute( $sql, return Application_Common_Database::prepareAndExecute( $sql,
array( array(
'start1' => $start_string, 'start1' => $start_string,