diff options
author | Carl Lerche <carllerche@mac.com> | 2010-04-03 09:54:15 -0700 |
---|---|---|
committer | Carl Lerche <carllerche@mac.com> | 2010-04-03 09:54:15 -0700 |
commit | 467d251c3dcbd3e4dd1e785a21d63535b795a64c (patch) | |
tree | aea2759a42e5632bea08e9baa30a5555ab42d907 /activerecord/lib/active_record/reflection.rb | |
parent | 6e18fa0375b7116328fbee920c074006962a52e8 (diff) | |
download | rails-467d251c3dcbd3e4dd1e785a21d63535b795a64c.tar.gz rails-467d251c3dcbd3e4dd1e785a21d63535b795a64c.tar.bz2 rails-467d251c3dcbd3e4dd1e785a21d63535b795a64c.zip |
Bring back +extra_conditions+. This effectively reverts 386b7bfd9d78a6d8c8bc7cc4a310df806ad0ba57
Diffstat (limited to 'activerecord/lib/active_record/reflection.rb')
-rw-r--r-- | activerecord/lib/active_record/reflection.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index 2a3f3f8713..0e48e229b3 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -277,11 +277,12 @@ module ActiveRecord !options[:validate].nil? ? options[:validate] : (options[:autosave] == true || macro == :has_many) end - def dependent_conditions(record, base_class) + def dependent_conditions(record, base_class, extra_conditions) dependent_conditions = [] dependent_conditions << "#{primary_key_name} = #{record.send(name).send(:owner_quoted_id)}" dependent_conditions << "#{options[:as]}_type = '#{base_class.name}'" if options[:as] dependent_conditions << klass.send(:sanitize_sql, options[:conditions]) if options[:conditions] + dependent_conditions << extra_conditions if extra_conditions dependent_conditions = dependent_conditions.collect {|where| "(#{where})" }.join(" AND ") dependent_conditions = dependent_conditions.gsub('@', '\@') dependent_conditions |