avoid multiple hash lookups

This commit is contained in:
Aaron Patterson
2010-08-11 14:59:47 -07:00
parent ce529b4759
commit 06dc884454

View File

@@ -80,10 +80,14 @@ module ActiveRecord
options.assert_valid_keys(VALID_FIND_OPTIONS)
[:joins, :select, :group, :having, :limit, :offset, :from, :lock, :readonly].each do |finder|
relation = relation.send(finder, options[finder]) if options.has_key?(finder)
[:joins, :select, :group, :having, :limit, :offset, :from, :lock].each do |finder|
if value = options[finder]
relation = relation.send(finder, value)
end
end
relation = relation.readonly(options[:readonly]) if options.key? :readonly
# Give precedence to newly-applied orders and groups to play nicely with with_scope
[:group, :order].each do |finder|
relation.send("#{finder}_values=", Array.wrap(options[finder]) + relation.send("#{finder}_values")) if options.has_key?(finder)