From 9ed763d945ffe2a468871d4731f3bd001caab21c Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" <> Date: Mon, 30 Jun 2008 02:34:36 +0000 Subject: Bug 421064: [Oracle] whine.pl crashes and doesn't work Patch By Xiaoou Wu r=mkanat, a=mkanat --- Bugzilla/DB/Oracle.pm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/Bugzilla/DB/Oracle.pm b/Bugzilla/DB/Oracle.pm index 19ebbb2c5..82d040dbf 100644 --- a/Bugzilla/DB/Oracle.pm +++ b/Bugzilla/DB/Oracle.pm @@ -171,8 +171,11 @@ sub sql_date_format { sub sql_interval { my ($self, $interval, $units) = @_; - - return "INTERVAL " . $self->quote($interval) . " $units"; + if ($units =~ /YEAR|MONTH/i) { + return "NUMTOYMINTERVAL($interval,'$units')"; + } else{ + return "NUMTODSINTERVAL($interval,'$units')"; + } } sub sql_position { @@ -490,7 +493,7 @@ sub bz_setup_database { } package Bugzilla::DB::Oracle::st; -use base qw(DBD::Oracle::st); +use base qw(DBI::st); sub fetchrow_arrayref { my $self = shift; @@ -545,5 +548,13 @@ sub fetchall_hashref { } return $ref; } - + +sub fetch { + my $self = shift; + my $row = $self->SUPER::fetch(@_); + if ($row) { + Bugzilla::DB::Oracle::_fix_arrayref($row); + } + return $row; +} 1; -- cgit v1.2.3-24-g4f1b