aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/query_methods.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-10-10 21:32:01 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2010-10-11 11:54:46 -0200
commite0b76d6151821527f16b3f163abde3ebea1b2a50 (patch)
treec303ea44988442d7dfbe021586978bba2d2de22a /activerecord/lib/active_record/relation/query_methods.rb
parent21a92b8d01eed34a6b26adb51139f1c40467409e (diff)
downloadrails-e0b76d6151821527f16b3f163abde3ebea1b2a50.tar.gz
rails-e0b76d6151821527f16b3f163abde3ebea1b2a50.tar.bz2
rails-e0b76d6151821527f16b3f163abde3ebea1b2a50.zip
reorder removed in favor of except(:order).order
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb11
1 files changed, 1 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 001207514d..a5dc051c6e 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -6,7 +6,7 @@ module ActiveRecord
extend ActiveSupport::Concern
attr_accessor :includes_values, :eager_load_values, :preload_values,
- :select_values, :group_values, :order_values, :reorder_flag, :joins_values, :where_values, :having_values,
+ :select_values, :group_values, :order_values, :joins_values, :where_values, :having_values,
:limit_value, :offset_value, :lock_value, :readonly_value, :create_with_value, :from_value
def includes(*args)
@@ -53,15 +53,6 @@ module ActiveRecord
relation
end
- def reorder(*args)
- relation = clone
- unless args.blank?
- relation.order_values = args
- relation.reorder_flag = true
- end
- relation
- end
-
def joins(*args)
relation = clone