kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rails3: model: query: parse dates using UTC (ruby 1.9 inside) (#4796) 

On Rails 3.0 and Ruby 1.8.7 in Japan (UTC+9), tests fails with following messages.

test_operator_date_equals(QueryTest) [test/unit/query_test.rb:206]:
<"(issues.due_date > '2011-07-09 14:59:59.999999' AND issues.due_date <= '2011-07-10 14:59:59.999999')
 AND (issue_statuses.is_closed='f')"> expected to be =~
</issues\.due_date > '2011-07-09 23:59:59(\.9+)?' AND issues\.due_date <= '2011-07-10 23:59:59(\.9+)?/>.

Contributed by Sylvain Utard.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7591 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-10-07 00:23:05 +00:00
parent 41a6c8be65
commit a17fcac822
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/query.rb
View File

@ -769,10 +769,13 @@ class Query < ActiveRecord::Base
def date_clause(table, field, from, to) def date_clause(table, field, from, to)
s = [] s = []
if from if from
s << ("#{table}.#{field} > '%s'" % [connection.quoted_date((from - 1).to_time.end_of_day)]) from_yesterday = from - 1
from_yesterday_utc = Time.gm(from_yesterday.year, from_yesterday.month, from_yesterday.day)
s << ("#{table}.#{field} > '%s'" % [connection.quoted_date(from_yesterday_utc.end_of_day)])
end end
if to if to
s << ("#{table}.#{field} <= '%s'" % [connection.quoted_date(to.to_time.end_of_day)]) to_utc = Time.gm(to.year, to.month, to.day)
s << ("#{table}.#{field} <= '%s'" % [connection.quoted_date(to_utc.end_of_day)])
end end
s.join(' AND ') s.join(' AND ')
end end