Revert "Bug 10606: Remove MySQLism in GetUpcomingDueIssues"
authorTomas Cohen Arazi <tomascohen@gmail.com>
Mon, 30 Mar 2015 14:45:13 +0000 (11:45 -0300)
committerTomas Cohen Arazi <tomascohen@gmail.com>
Mon, 30 Mar 2015 15:13:05 +0000 (12:13 -0300)
This patch reverts a commit that breaks GetUpcomingDueIssues-related
tests.

This reverts commit 5ee0293ed6207a801df234b09f33bebb84e65e05.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
C4/Circulation.pm

index 80e5dc4..ed3faf6 100644 (file)
@@ -2604,13 +2604,12 @@ sub GetUpcomingDueIssues {
     my $dbh = C4::Context->dbh;
 
     my $statement = <<END_SQL;
-SELECT issues.*, items.itype as itemtype, items.homebranch, DATE( date_due )-DATE( NOW() ) as days_until_due, branches.branchemail
+SELECT issues.*, items.itype as itemtype, items.homebranch, TO_DAYS( date_due )-TO_DAYS( NOW() ) as days_until_due, branches.branchemail
 FROM issues 
 LEFT JOIN items USING (itemnumber)
 LEFT OUTER JOIN branches USING (branchcode)
 WHERE returndate is NULL
-AND (DATE( date_due )-DATE( NOW() )) >= 0
-AND (DATE( date_due )-DATE( NOW() )) <= ?
+HAVING days_until_due >= 0 AND days_until_due <= ?
 END_SQL
 
     my @bind_parameters = ( $params->{'days_in_advance'} );