Reverse order fix when using function for ActiveRecord::QueryMethods Fixes #1697
This commit is contained in:
parent
fa2bfd832c
commit
18d307ed94
@ -312,7 +312,7 @@ def reverse_sql_order(order_query)
|
||||
when String, Symbol
|
||||
o.to_s.split(',').collect do |s|
|
||||
s.strip!
|
||||
s.gsub!(/\sasc\Z/i, ' DESC') || s.gsub!(/\sdesc\Z/i, ' ASC') || s.concat(' DESC')
|
||||
(s if s =~ /\(/) || s.gsub!(/\sasc\Z/i, ' DESC') || s.gsub!(/\sdesc\Z/i, ' ASC') || s.concat(' DESC')
|
||||
end
|
||||
else
|
||||
o
|
||||
|
@ -911,6 +911,11 @@ def test_default_scope_order_with_scope_order
|
||||
assert_equal 'zyke', FastCar.order_using_old_style.limit(1).first.name
|
||||
end
|
||||
|
||||
def test_order_with_function_and_last
|
||||
authors = Author.scoped
|
||||
assert_equal authors(:bob), authors.order( "id asc, MAX( organization_id, owned_essay_id)" ).last
|
||||
end
|
||||
|
||||
def test_order_using_scoping
|
||||
car1 = CoolCar.order('id DESC').scoping do
|
||||
CoolCar.find(:first, :order => 'id asc')
|
||||
|
Loading…
Reference in New Issue
Block a user