diff options
| author | mkanat%kerio.com <> | 2005-02-20 16:53:16 +0100 |
|---|---|---|
| committer | mkanat%kerio.com <> | 2005-02-20 16:53:16 +0100 |
| commit | e547dd6d7b7b9a3c2135c56dd6b7a433743fd4b1 (patch) | |
| tree | 179cd1f21b8e26b2cf2feec6ebfe30ddbd33afdd /Bugzilla | |
| parent | 335b8c125f821a96ddfd769163c92c1d74ce62f6 (diff) | |
| download | bugzilla-e547dd6d7b7b9a3c2135c56dd6b7a433743fd4b1.tar.gz bugzilla-e547dd6d7b7b9a3c2135c56dd6b7a433743fd4b1.tar.xz | |
Bug 280499: Replace "TO_DAYS()" with Bugzilla::DB function call
Patch By Tomas Kopal <Tomas.Kopal@altap.cz> r=mkanat, a=justdave
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/Auth/Login/WWW/CGI.pm | 7 | ||||
| -rw-r--r-- | Bugzilla/Chart.pm | 6 | ||||
| -rw-r--r-- | Bugzilla/Search.pm | 3 | ||||
| -rw-r--r-- | Bugzilla/Token.pm | 5 |
4 files changed, 12 insertions, 9 deletions
diff --git a/Bugzilla/Auth/Login/WWW/CGI.pm b/Bugzilla/Auth/Login/WWW/CGI.pm index 98999a368..42e454f86 100644 --- a/Bugzilla/Auth/Login/WWW/CGI.pm +++ b/Bugzilla/Auth/Login/WWW/CGI.pm @@ -45,6 +45,7 @@ sub login { } my $cgi = Bugzilla->cgi; + my $dbh = Bugzilla->dbh; # First, try the actual login method against form variables my $username = $cgi->param("Bugzilla_login"); @@ -67,7 +68,6 @@ sub login { # subsequent login trick_taint($ipaddr); - my $dbh = Bugzilla->dbh; $dbh->do("INSERT INTO logincookies (userid, ipaddr, lastused) VALUES (?, ?, NOW())", undef, @@ -159,8 +159,9 @@ sub login { # This seems like as good as time as any to get rid of old # crufty junk in the logincookies table. Get rid of any entry # that hasn't been used in a month. - Bugzilla->dbh->do("DELETE FROM logincookies " . - "WHERE TO_DAYS(NOW()) - TO_DAYS(lastused) > 30"); + $dbh->do("DELETE FROM logincookies WHERE " . + $dbh->sql_to_days('NOW()') . " - " . + $dbh->sql_to_days('lastused') . " > 30"); exit; } diff --git a/Bugzilla/Chart.pm b/Bugzilla/Chart.pm index 90c1ad16f..0836adde3 100644 --- a/Bugzilla/Chart.pm +++ b/Bugzilla/Chart.pm @@ -229,9 +229,9 @@ sub readData { } # Prepare the query which retrieves the data for each series - my $query = "SELECT TO_DAYS(series_date) - " . - " TO_DAYS(FROM_UNIXTIME($datefrom)), " . - "series_value FROM series_data " . + my $query = "SELECT " . $dbh->sql_to_days('series_date') . " - " . + $dbh->sql_to_days('FROM_UNIXTIME($datefrom)') . + ", series_value FROM series_data " . "WHERE series_id = ? " . "AND series_date >= FROM_UNIXTIME($datefrom)"; if ($dateto) { diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm index 6584f1080..82cbb9aa6 100644 --- a/Bugzilla/Search.pm +++ b/Bugzilla/Search.pm @@ -797,7 +797,8 @@ sub init { }, "^changedin," => sub { - $f = "(to_days(now()) - to_days(bugs.delta_ts))"; + $f = "(" . $dbh->sql_to_days('NOW()') . " - " . + $dbh->sql_to_days('bugs.delta_ts') . ")"; }, "^component,(?!changed)" => sub { diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm index 548430847..4c70d4bad 100644 --- a/Bugzilla/Token.pm +++ b/Bugzilla/Token.pm @@ -163,8 +163,9 @@ sub IssuePasswordToken { sub CleanTokenTable { my $dbh = Bugzilla->dbh; $dbh->bz_lock_tables('tokens WRITE'); - &::SendSQL("DELETE FROM tokens - WHERE TO_DAYS(NOW()) - TO_DAYS(issuedate) >= " . $maxtokenage); + &::SendSQL("DELETE FROM tokens WHERE " . + $dbh->sql_to_days('NOW()') . " - " . + $dbh->sql_to_days('issuedate') . " >= " . $maxtokenage); $dbh->bz_unlock_tables(); } |