From a7a50b5daf10c093e7a5a95fe64d1d6e2ed43856 Mon Sep 17 00:00:00 2001 From: CDD Developers Date: Mon, 19 Apr 2010 15:06:50 -0700 Subject: Fixed regression bug with lazy evaluation of has_many dependent when dealing with STI and polymorphic associations. refs https://rails.lighthouseapp.com/projects/8994/tickets/2627-has_many-dependent-gt-destroy-throws-exception-on-models-in-modules --- .../activerecord/lib/active_record/associations.rb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index b8b6b4c..b1f1e65 100755 --- a/ruby/vendor/rails/activerecord/lib/active_record/associations.rb +++ b/ruby/vendor/rails/activerecord/lib/active_record/associations.rb @@ -1422,7 +1422,7 @@ module ActiveRecord record, reflection.name, reflection.klass, - reflection.dependent_conditions(record, record.class, extra_conditions)) + reflection.dependent_conditions(record, record.class.base_class, extra_conditions)) end when :nullify before_destroy do |record| @@ -1431,7 +1431,7 @@ module ActiveRecord reflection.name, reflection.klass, reflection.primary_key_name, - reflection.dependent_conditions(record, record.class, extra_conditions)) + reflection.dependent_conditions(record, record.class.base_class, extra_conditions)) end else raise ArgumentError, "The :dependent option expects either :destroy, :delete_all, or :nullify (#{reflection.options[:dependent].inspect})" -- 1.7.0