kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Small refactor to update_all.

Browse source
This commit is contained in:
Emilio Tagua 2009-07-01 16:16:11 -03:00
parent a9cd9f4c75
commit 0f5785c997
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
activerecord/lib/active_record/base.rb
View file

@ -867,12 +867,12 @@ module ActiveRecord #:nodoc:
arel = arel.where(Arel::SqlLiteral.new(conditions))
end
if options.has_key?(:limit) || (scope && scope[:limit])
arel = if options.has_key?(:limit) || (scope && scope[:limit])
# Only take order from scope if limit is also provided by scope, this
# is useful for updating a has_many association with a limit.
arel = arel.order(construct_order(options[:order], scope)).take(construct_limit(options, scope))
arel.order(construct_order(options[:order], scope)).take(construct_limit(options, scope))
else
arel = arel.order(construct_order(options[:order], nil))
arel.order(construct_order(options[:order], nil))
end
arel.update(sanitize_sql_for_assignment(updates))