aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
diff options
context:
space:
mode:
authorOlek Janiszewski <olek.janiszewski@gmail.com>2013-02-26 16:55:18 +0100
committerOlek Janiszewski <olek.janiszewski@gmail.com>2013-02-26 18:46:10 +0100
commitdce4383319d8fcccc26d12fc0bbd4b19a149ee41 (patch)
tree3f88586fff65fffde8eaa2f8ba45eeac7312f5a7 /activerecord/lib/active_record/associations
parente24e086ef1de73beffc0870cb37d6ae42cbbd2c8 (diff)
downloadrails-dce4383319d8fcccc26d12fc0bbd4b19a149ee41.tar.gz
rails-dce4383319d8fcccc26d12fc0bbd4b19a149ee41.tar.bz2
rails-dce4383319d8fcccc26d12fc0bbd4b19a149ee41.zip
Fix touching an invalid parent record for belongs_to
If the parent of a `belongs_to` record fails to be saved due to validation errors, `touch` will be called on a new record, which causes an exception (see https://github.com/rails/rails/pull/9320). Example: class Owner < ActiveRecord::Base validates_presence_of :name end class Pet < ActiveRecord::Base belongs_to :owner, touch: true end pet = Pet.new(owner: Owner.new) # Before, this line would raise ActiveRecord::ActiveRecordError # "can not touch on a new record object" pet.save
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r--activerecord/lib/active_record/associations/builder/belongs_to.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/builder/belongs_to.rb b/activerecord/lib/active_record/associations/builder/belongs_to.rb
index 2f2600b7fb..97b1ff18e2 100644
--- a/activerecord/lib/active_record/associations/builder/belongs_to.rb
+++ b/activerecord/lib/active_record/associations/builder/belongs_to.rb
@@ -48,7 +48,7 @@ module ActiveRecord::Associations::Builder
def belongs_to_touch_after_save_or_destroy_for_#{name}
record = #{name}
- unless record.nil?
+ unless record.nil? || record.new_record?
record.touch #{options[:touch].inspect if options[:touch] != true}
end
end