diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2013-05-24 03:35:20 -0700 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-05-24 03:35:20 -0700 |
| commit | 7101a857b46e1c8aa3b9dd9641c4fc5b28a143e6 (patch) | |
| tree | df7bb42f0850895d0aea3a4ad1de237d970a84f1 /activerecord/lib/active_record | |
| parent | d29399061e54092fdbf57780c38e19dd1921f45d (diff) | |
| parent | 0e14973a3368945d9a7fddb4bfeefe3fc2f2a246 (diff) | |
| download | rails-7101a857b46e1c8aa3b9dd9641c4fc5b28a143e6.tar.gz rails-7101a857b46e1c8aa3b9dd9641c4fc5b28a143e6.tar.bz2 rails-7101a857b46e1c8aa3b9dd9641c4fc5b28a143e6.zip | |
Merge pull request #10745 from arunagw/build_fix_ruby187
Build fix ruby187
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index dab57bab88..5296cb7282 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -89,7 +89,7 @@ module ActiveRecord records.each { |r| r.destroy } update_counter(-records.length) unless inverse_updates_counter_cache? else - scope = self.scope.where(reflection.klass.primary_key => records) + scope = self.scoped.where(reflection.klass.primary_key => records) if method == :delete_all update_counter(-scope.delete_all) |