Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 301141: [PostgreSQL] New charts throw an error about FROM_UNIXTIME - Patch by Fr�d�ric Buclin <LpSolit@gmail.com> r=mkanat a=justdave

Browse Source
This commit is contained in:
lpsolit%gmail.com 2005-11-15 09:53:00 +00:00
parent 8110d93f42
commit 9054ecca63
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
webtools/bugzilla/Bugzilla/Chart.pm
View File

@ -33,6 +33,8 @@ package Bugzilla::Chart;
use Bugzilla::Util;
use Bugzilla::Series;
use Date::Format;
sub new {
my $invocant = shift;
my $class = ref($invocant) || $invocant;
@ -233,14 +235,18 @@ sub readData {
$dateto = $self->{'dateto'};
}
# Convert UNIX times back to a date format usable for SQL queries.
my $sql_from = time2str('%Y-%m-%d', $datefrom);
my $sql_to = time2str('%Y-%m-%d', $dateto);
# Prepare the query which retrieves the data for each series
my $query = "SELECT " . $dbh->sql_to_days('series_date') . " - " .
$dbh->sql_to_days("FROM_UNIXTIME($datefrom)") .
", series_value FROM series_data " .
my $query = "SELECT " . $dbh->sql_to_days('series_date') . " - " .
$dbh->sql_to_days('?') . ", series_value " .
"FROM series_data " .
"WHERE series_id = ? " .
"AND series_date >= FROM_UNIXTIME($datefrom)";
"AND series_date >= ?";
if ($dateto) {
$query .= " AND series_date <= FROM_UNIXTIME($dateto)";
$query .= " AND series_date <= ?";
}
my $sth = $dbh->prepare($query);
@ -256,7 +262,12 @@ sub readData {
foreach my $series (@$line) {
# Get the data for this series and add it on
$sth->execute($series->{'series_id'});
if ($dateto) {
$sth->execute($sql_from, $series->{'series_id'}, $sql_from, $sql_to);
}
else {
$sth->execute($sql_from, $series->{'series_id'}, $sql_from);
}
my $points = $sth->fetchall_arrayref();
foreach my $point (@$points) {

2
webtools/bugzilla/Bugzilla/DB/Pg.pm
View File

@ -114,7 +114,7 @@ sub sql_limit {
sub sql_to_days {
my ($self, $date) = @_;
return "TO_CHAR($date, 'J')::int";
return "TO_CHAR(${date}::date, 'J')::int";
}
sub sql_date_format {