Ticket #3238: changed_attributes.patch

test/base_test.rb

@@ -1104 +1104 @@
-    developers = Developer.find(:all, :order => 'id')
-    assert_equal 10, developers.size
-  end
+
+  def test_attribute_changed
+    # Test for mass attribute and creation
+    topic = Topic.new(:title => "Test Topic", :content => "Is this thing on?", 
+                      :author_name => "Loren", :author_email_address => "lsegal@holycraplions.com")
+    assert topic.attribute_changed?(:title)
+    assert topic.attribute_changed?(:author_email_address)
+    assert_equal 4, topic.changed_attributes.size
+    topic.save
+    assert !topic.attribute_changed?(:title)
+    assert_equal 0, topic.changed_attributes.size
+    
+    # Test for an update
+    topic.title = "We changed the topic"
+    assert topic.attribute_changed?(:title)
+    assert_equal ["title"], topic.changed_attributes
+    topic.save
+    assert !topic.attribute_changed?(:title)
+    assert_equal 0, topic.changed_attributes.size
+    
+    # Test for an existing record update
+    topic = Topic.find(:first)
+    assert !topic.attribute_changed?(:content)
+    assert_equal 0, topic.changed_attributes.size
+    topic.content = "We changed the content this time."
+    assert topic.attribute_changed?(:content)
+    assert_equal ["content"], topic.changed_attributes
+    topic.save
+    assert !topic.attribute_changed?(:content)
+    assert_equal 0, topic.changed_attributes.size
+  end
-  
+  def test_reset_changed_attributes
+    topic = Topic.find(:first)
+    topic.author_name = "Johnny"
+    assert topic.attribute_changed?(:author_name)
+    assert_equal ["author_name"], topic.changed_attributes
+    
+    # Reload and check if attributes reset
+    topic.reload
+    assert !topic.attribute_changed?(:author_name)
+    assert_equal 0, topic.changed_attributes.size
+  end
+
-  # FIXME: this test ought to run, but it needs to run sandboxed so that it
-  # doesn't b0rk the current test environment by undefing everything.
-  #

lib/active_record/base.rb

@@ -906 +906 @@
-            end
-
-          object.instance_variable_set("@attributes", record)
+          object.instance_eval("reset_changed_attributes")
-          object
-        end
-
@@ -1189 +1190 @@
-      def initialize(attributes = nil)
-        @attributes = attributes_from_column_definition
-        @new_record = true
+        reset_changed_attributes
-        ensure_proper_type
-        self.attributes = attributes unless attributes.nil?
-        yield self if block_given?
@@ -1229 +1231 @@
-      def save
-        raise ActiveRecord::ReadOnlyRecord if readonly?
-        create_or_update
+        reset_changed_attributes
-      end
-
-      # Deletes the record in the database and freezes this instance to reflect that no changes should
@@ -1311 +1314 @@
-      def reload
-        clear_aggregation_cache
-        clear_association_cache
+        reset_changed_attributes
-        @attributes.update(self.class.find(self.id).instance_variable_get('@attributes'))
-        self
-      end
@@ -1365 +1369 @@
-      def has_attribute?(attr_name)
-        @attributes.has_key?(attr_name.to_s)
-      end
+      
+      # Returns true if the given attribute has been modified
+      def attribute_changed?(attr_name)
+        @attributes_changed.has_key?(attr_name.to_s)
+      end
+      
+      # Returns an array of attributes modified since last database read or save
+      def changed_attributes
+        @attributes_changed.keys
+      end
-
-      # Returns an array of names for the attributes available on this object sorted alphabetically.
-      def attribute_names
@@ -1438 +1452 @@
-
-      # Updates the associated record with values matching those of the instance attributes.
-      def update
+        return true if changed_attributes.empty?
-        connection.update(
-          "UPDATE #{self.class.table_name} " +
-
+, true
-          "WHERE #{self.class.primary_key} = #{quote(id)}",
-          "#{self.class.name} Update"
-        )
@@ -1589 +1604 @@
-        else
-          @attributes[attr_name] = value
-        end
+        @attributes_changed[attr_name] = true
-      end
-
-      def convert_number_column_value(value)
@@ -1637 +1653 @@
-        default << 'id' unless self.class.primary_key.eql? 'id'
-        default
-      end
+      
+      # Resets attributes that have been modified since last database access or save
+      def reset_changed_attributes
+        @attributes_changed = {}
+      end
-
-      # Returns copy of the attributes hash where all the values have been safely quoted for use in
-
-
+
+
+
-        attributes.inject({}) do |quoted, (name, value)|
-
-
+
+
+
+
-          end
-          quoted
-        end