diff options
author | Paul Nikitochkin <paul.nikitochkin@gmail.com> | 2013-08-21 10:49:18 +0300 |
---|---|---|
committer | Paul Nikitochkin <paul.nikitochkin@gmail.com> | 2013-09-04 11:57:39 +0300 |
commit | 3f1c0c2bd0b89255b0d7d8d6fe45ac2d50b05076 (patch) | |
tree | 3c40afa130e16284adeffbfddf6d0989d62cda4f /activerecord/lib/active_record/relation/query_methods.rb | |
parent | 6524a85fa5d34622c74de43ee1264f55d19910ff (diff) | |
download | rails-3f1c0c2bd0b89255b0d7d8d6fe45ac2d50b05076.tar.gz rails-3f1c0c2bd0b89255b0d7d8d6fe45ac2d50b05076.tar.bz2 rails-3f1c0c2bd0b89255b0d7d8d6fe45ac2d50b05076.zip |
Extracted from `order` processing of arguments, and use it for `reorder` to be consistent.
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
-rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 9f2a039d94..1c6ea94c0b 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -289,17 +289,7 @@ module ActiveRecord end def order!(*args) # :nodoc: - args.flatten! - validate_order_args(args) - - references = args.grep(String) - references.map! { |arg| arg =~ /^([a-zA-Z]\w*)\.(\w+)/ && $1 }.compact! - references!(references) if references.any? - - # if a symbol is given we prepend the quoted table name - args.map! do |arg| - arg.is_a?(Symbol) ? Arel::Nodes::Ascending.new(klass.arel_table[arg]) : arg - end + preprocess_order_args(args) self.order_values += args self @@ -320,8 +310,7 @@ module ActiveRecord end def reorder!(*args) # :nodoc: - args.flatten! - validate_order_args(args) + preprocess_order_args(args) self.reordering_value = true self.order_values = args @@ -1036,6 +1025,20 @@ module ActiveRecord end end + def preprocess_order_args(order_args) + order_args.flatten! + validate_order_args(order_args) + + references = order_args.grep(String) + references.map! { |arg| arg =~ /^([a-zA-Z]\w*)\.(\w+)/ && $1 }.compact! + references!(references) if references.any? + + # if a symbol is given we prepend the quoted table name + order_args.map! do |arg| + arg.is_a?(Symbol) ? Arel::Nodes::Ascending.new(klass.arel_table[arg]) : arg + end + end + # Checks to make sure that the arguments are not blank. Note that if some # blank-like object were initially passed into the query method, then this # method will not raise an error. |