From: David Taylor <davidt@yadt.co.uk>
Date: Sun, 26 Aug 2012 01:19:57 +0000 (+0200)
Subject: Bug 559539: [Oracle] whine.pl sets run_next incorrectly due to CURRENT_DATE
X-Git-Tag: bugzilla-4.3.3~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d84eb9775323c4a3ba52a1f8fe0147cd6d2c32a0;p=thirdparty%2Fbugzilla.git

Bug 559539: [Oracle] whine.pl sets run_next incorrectly due to CURRENT_DATE
r/a=LpSolit
---

diff --git a/Bugzilla/DB/Oracle.pm b/Bugzilla/DB/Oracle.pm
index 3022e3b343..d7ff086769 100644
--- a/Bugzilla/DB/Oracle.pm
+++ b/Bugzilla/DB/Oracle.pm
@@ -294,6 +294,9 @@ sub adjust_statement {
     my $is_select = ($part =~ m/^\s*SELECT\b/io);
     my $has_from =  ($part =~ m/\bFROM\b/io) if $is_select;
 
+    # Oracle includes the time in CURRENT_DATE.
+    $part =~ s/\bCURRENT_DATE\b/TRUNC(CURRENT_DATE)/io;
+
     # Oracle use SUBSTR instead of SUBSTRING
     $part =~ s/\bSUBSTRING\b/SUBSTR/io;
    
@@ -322,6 +325,9 @@ sub adjust_statement {
         $has_from = ($nonstring =~ m/\bFROM\b/io) 
                     if ($is_select and !$has_from);
 
+        # Oracle includes the time in CURRENT_DATE.
+        $nonstring =~ s/\bCURRENT_DATE\b/TRUNC(CURRENT_DATE)/io;
+
         # Oracle use SUBSTR instead of SUBSTRING
         $nonstring =~ s/\bSUBSTRING\b/SUBSTR/io;