0
@@ -69,19 +69,19 @@ module ActiveRecord
0
       changed.inject({}) { |h, attr| h[attr] = attribute_change(attr); h }
0
     end
0
 
0
-
0
-    # Clear changed attributes after they are saved.
0
+    # Attempts to +save+ the record and clears changed attributes if successful.
0
     def save_with_dirty(*args) #:nodoc:
0
-      save_without_dirty(*args)
0
-    ensure
0
-      changed_attributes.clear
0
+      if status = save_without_dirty(*args)
0
+        changed_attributes.clear
0
+      end
0
+      status
0
     end
0
 
0
-    # Clear changed attributes after they are saved.
0
+    # Attempts to <tt>save!</tt> the record and clears changed attributes if successful.
0
     def save_with_dirty!(*args) #:nodoc:
0
-      save_without_dirty!(*args)
0
-    ensure
0
+      status = save_without_dirty!(*args)
0
       changed_attributes.clear
0
+      status
0
     end
0
 
0
     private

0
@@ -78,7 +78,7 @@ class DirtyTest < ActiveRecord::TestCase
0
   end
0
 
0
   def test_association_assignment_changes_foreign_key
0
-    pirate = Pirate.create!
0
+    pirate = Pirate.create!(:catchphrase => 'jarl')
0
     pirate.parrot = Parrot.create!
0
     assert pirate.changed?
0
     assert_equal %w(parrot_id), pirate.changed
0
@@ -115,6 +115,18 @@ class DirtyTest < ActiveRecord::TestCase
0
     end
0
   end
0
 
0
+  def test_changed_attributes_should_be_preserved_if_save_failure
0
+    pirate = Pirate.new
0
+    pirate.parrot_id = 1
0
+    assert !pirate.save
0
+    check_pirate_after_save_failure(pirate)
0
+
0
+    pirate = Pirate.new
0
+    pirate.parrot_id = 1
0
+    assert_raises(ActiveRecord::RecordInvalid) { pirate.save! }
0
+    check_pirate_after_save_failure(pirate)
0
+  end
0
+
0
   private
0
     def with_partial_updates(klass, on = true)
0
       old = klass.partial_updates?
0
@@ -123,4 +135,11 @@ class DirtyTest < ActiveRecord::TestCase
0
     ensure
0
       klass.partial_updates = old
0
     end
0
+
0
+    def check_pirate_after_save_failure(pirate)
0
+      assert pirate.changed?
0
+      assert pirate.parrot_id_changed?
0
+      assert_equal %w(parrot_id), pirate.changed
0
+      assert_nil pirate.parrot_id_was
0
+    end
0
 end

0
@@ -4,4 +4,6 @@ class Pirate < ActiveRecord::Base
0
   has_many :treasures, :as => :looter
0
 
0
   has_many :treasure_estimates, :through => :treasures, :source => :price_estimates
0
+
0
+  validates_presence_of :catchphrase
0
 end