diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 4 | ||||
| -rwxr-xr-x | activerecord/test/base_test.rb | 7 |
3 files changed, 11 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index a6e963bebe..7d5771222b 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* update_all ignores scoped :order and :limit, so post.comments.update_all doesn't try to include the comment order in the update statement. #10686 [Brendan Ribera] + * Added ActiveRecord::Base.cache_key to make it easier to cache Active Records in combination with the new ActiveSupport::Cache::* libraries [DHH] * Make sure CSV fixtures are compatible with ruby 1.9's new csv implementation. [JEG2] diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index d784f59d11..06d21f5525 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -680,8 +680,8 @@ module ActiveRecord #:nodoc: sql = "UPDATE #{table_name} SET #{sanitize_sql_for_assignment(updates)} " scope = scope(:find) add_conditions!(sql, conditions, scope) - add_order!(sql, options[:order], scope) - add_limit!(sql, options, scope) + add_order!(sql, options[:order], nil) + add_limit!(sql, options, nil) connection.update(sql, "#{name} Update") end diff --git a/activerecord/test/base_test.rb b/activerecord/test/base_test.rb index 5f8f1537d9..b140e9ce54 100755 --- a/activerecord/test/base_test.rb +++ b/activerecord/test/base_test.rb @@ -596,6 +596,13 @@ class BasicsTest < Test::Unit::TestCase end end + def test_update_all_ignores_order_limit_from_association + author = Author.find(1) + assert_nothing_raised do + assert_equal author.posts_with_comments_and_categories.length, author.posts_with_comments_and_categories.update_all("body = 'bulk update!'") + end + end + def test_update_many topic_data = { 1 => { "content" => "1 updated" }, 2 => { "content" => "2 updated" } } updated = Topic.update(topic_data.keys, topic_data.values) |