diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-16 03:37:04 +0530 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-16 03:37:04 +0530 |
commit | 21ce8eac9b9bd8e14e3396caf2e30751889e26cb (patch) | |
tree | c70d4aa44aa1dcf79627fcdcd0a8b5471340d55e | |
parent | 951e485b888c15fc651439686676a4e8956d0255 (diff) | |
download | rails-21ce8eac9b9bd8e14e3396caf2e30751889e26cb.tar.gz rails-21ce8eac9b9bd8e14e3396caf2e30751889e26cb.tar.bz2 rails-21ce8eac9b9bd8e14e3396caf2e30751889e26cb.zip |
Remove stale construct_* methods
-rwxr-xr-x | activerecord/lib/active_record/base.rb | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 19a80a335e..ab78248608 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1609,30 +1609,6 @@ module ActiveRecord #:nodoc: end end - def construct_order(order, scope) - orders = [] - - scoped_order = scope[:order] if scope - if order - orders << order - orders << scoped_order if scoped_order && scoped_order != order - elsif scoped_order - orders << scoped_order - end - - orders.reject {|o| o.blank?} - end - - def construct_limit(limit, scope) - limit ||= scope[:limit] if scope - limit - end - - def construct_offset(offset, scope) - offset ||= scope[:offset] if scope - offset - end - # Merges includes so that the result is a valid +include+ def merge_includes(first, second) (Array.wrap(first) + Array.wrap(second)).uniq |