kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Ordering with extra spaces was raising a SQL exception

Browse source
This commit is contained in:
Franck Verrot 2011-07-24 08:17:36 +02:00
parent d33eb07543
commit 77bb0b79f2
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
activerecord/lib/active_record/relation/query_methods.rb
View file

@ -311,6 +311,7 @@ module ActiveRecord
o.reverse o.reverse
when String, Symbol when String, Symbol
o.to_s.split(',').collect do |s| 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.gsub!(/\sasc\Z/i, ' DESC') || s.gsub!(/\sdesc\Z/i, ' ASC') || s.concat(' DESC')
end end
else else

4
activerecord/test/cases/relations_test.rb
View file

@ -961,4 +961,8 @@ class RelationTest < ActiveRecord::TestCase
assert scope.eager_loading? assert scope.eager_loading?
end end
def test_ordering_with_extra_spaces
assert_equal authors(:david), Author.order('organization_id ASC , owned_essay_id DESC').last
end
end end