Don't mark the store as changed if an attribute isn't changed.

kennyj · Jul 3, 2012 · 9196b93 · 9196b93
1 parent 215d41d
commit 9196b93
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/activerecord/lib/active_record/store.rb b/activerecord/lib/active_record/store.rb
@@ -58,8 +58,11 @@ def store_accessor(store_attribute, *keys)
         keys.each do |key|
           define_method("#{key}=") do |value|
             initialize_store_attribute(store_attribute)
-            send(store_attribute)[key] = value
-            send :"#{store_attribute}_will_change!"
+            attribute = send(store_attribute)
+            if value != attribute[key]
+              attribute[key] = value
+              send :"#{store_attribute}_will_change!"
+            end
           end
 
           define_method(key) do

diff --git a/activerecord/test/cases/store_test.rb b/activerecord/test/cases/store_test.rb
@@ -34,6 +34,11 @@ class StoreTest < ActiveRecord::TestCase
     assert @john.settings_changed?
   end
 
+  test "updating the store won't mark it as changed if an attribute isn't changed" do
+    @john.color = @john.color
+    assert !@john.settings_changed?
+  end
+
   test "object initialization with not nullable column" do
     assert_equal true, @john.remember_login
   end