diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-20 18:34:43 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-20 18:34:43 -0700 |
| commit | b10fb7e7bcb5efea6c93ae52bad125887cfc235c (patch) | |
| tree | bda34b186b63ac607e7387df935e4d67f3b5123b /activerecord/lib/active_record/associations.rb | |
| parent | 164a94d0bc8c9124ab820506e5ad79496395c026 (diff) | |
| parent | de0ea3866370ec61581f910cf393a3cc97eba32f (diff) | |
| download | rails-b10fb7e7bcb5efea6c93ae52bad125887cfc235c.tar.gz rails-b10fb7e7bcb5efea6c93ae52bad125887cfc235c.tar.bz2 rails-b10fb7e7bcb5efea6c93ae52bad125887cfc235c.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | 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 53a710537f..2115878e32 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1375,7 +1375,7 @@ module ActiveRecord dependent_conditions = [] dependent_conditions << "#{reflection.primary_key_name} = \#{record.quoted_id}" dependent_conditions << "#{reflection.options[:as]}_type = '#{base_class.name}'" if reflection.options[:as] - dependent_conditions << sanitize_sql(reflection.options[:conditions]) if reflection.options[:conditions] + dependent_conditions << sanitize_sql(reflection.options[:conditions], reflection.quoted_table_name) if reflection.options[:conditions] dependent_conditions << extra_conditions if extra_conditions dependent_conditions = dependent_conditions.collect {|where| "(#{where})" }.join(" AND ") dependent_conditions = dependent_conditions.gsub('@', '\@') @@ -2123,7 +2123,7 @@ module ActiveRecord klass.send(:type_condition, aliased_table_name)] unless klass.descends_from_active_record? [through_reflection, reflection].each do |ref| - join << "AND #{interpolate_sql(sanitize_sql(ref.options[:conditions]))} " if ref && ref.options[:conditions] + join << "AND #{interpolate_sql(sanitize_sql(ref.options[:conditions], aliased_table_name))} " if ref && ref.options[:conditions] end join |