diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-07-28 13:14:11 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-07-28 13:14:11 +0100 |
| commit | 971a74b81f37ec82e06056b738a7215185c51ee6 (patch) | |
| tree | ec9e5863c80614c684047661c5b993d4eeb0db7c | |
| parent | 30dae273c85a988a39d9b1dec701c0a48267cd5e (diff) | |
| download | rails-971a74b81f37ec82e06056b738a7215185c51ee6.tar.gz rails-971a74b81f37ec82e06056b738a7215185c51ee6.tar.bz2 rails-971a74b81f37ec82e06056b738a7215185c51ee6.zip | |
Revert "Merge pull request #2309 from smasry/master"
This reverts commit 9d396ee8195e31f646e0b89158ed96f4db4ab38f, reversing
changes made to fa2bfd832c1d1e997d93c2269a485cc74782c86d.
Reason: the change broke the build.
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/relations_test.rb | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 3a7b245c51..1654ae1eac 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -312,7 +312,7 @@ module ActiveRecord when String, Symbol o.to_s.split(',').collect do |s| s.strip! - (s if s =~ /\(/) || 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 else o diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb index 8a2cf0ef85..821da91f0a 100644 --- a/activerecord/test/cases/relations_test.rb +++ b/activerecord/test/cases/relations_test.rb @@ -911,11 +911,6 @@ class RelationTest < ActiveRecord::TestCase 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') |