diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-06 22:22:07 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-06 22:22:07 -0300 |
| commit | 19d32e89af09af4a6f7c7b49f57f4e4d1ef02b10 (patch) | |
| tree | 11003cf01ec859d9755cce6cf7c6c02adc7ac800 /activerecord/lib/active_record | |
| parent | 8d85baa0e317c5baa3b8671d7fdd79e36f7058c7 (diff) | |
| parent | 228720ef19e7dcf7c21f4ef2171906cc7c8c97f1 (diff) | |
| download | rails-19d32e89af09af4a6f7c7b49f57f4e4d1ef02b10.tar.gz rails-19d32e89af09af4a6f7c7b49f57f4e4d1ef02b10.tar.bz2 rails-19d32e89af09af4a6f7c7b49f57f4e4d1ef02b10.zip | |
Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroy
Confirm a record has not already been destroyed before decrementing counter cache
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/belongs_to.rb | 4 |
1 files changed, 3 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 543a0247d1..63e9526436 100644 --- a/activerecord/lib/active_record/associations/builder/belongs_to.rb +++ b/activerecord/lib/active_record/associations/builder/belongs_to.rb @@ -34,7 +34,9 @@ module ActiveRecord::Associations::Builder def belongs_to_counter_cache_before_destroy_for_#{name} unless destroyed_by_association && destroyed_by_association.foreign_key.to_sym == #{foreign_key.to_sym.inspect} record = #{name} - record.class.decrement_counter(:#{cache_column}, record.id) unless record.nil? + if record && !self.destroyed? + record.class.decrement_counter(:#{cache_column}, record.id) + end end end |