diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-01 04:14:34 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-01 04:17:56 +0530 |
| commit | 77c23b2104d62ab1cf1fb5808fef14e38d094605 (patch) | |
| tree | 00162de0523eb735b44d74e1ba9b096e8bcad2da /activerecord/lib/active_record/associations.rb | |
| parent | 141d3aff2f010384cc5d3488f75605bd0f702416 (diff) | |
| download | rails-77c23b2104d62ab1cf1fb5808fef14e38d094605.tar.gz rails-77c23b2104d62ab1cf1fb5808fef14e38d094605.tar.bz2 rails-77c23b2104d62ab1cf1fb5808fef14e38d094605.zip | |
Use PredicateBuilder for sql hash sanitization
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index f0bad6c3ba..052197f7ad 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1488,7 +1488,7 @@ module ActiveRecord dependent_conditions = [] dependent_conditions << "#{reflection.primary_key_name} = \#{record.#{reflection.name}.send(:owner_quoted_id)}" dependent_conditions << "#{reflection.options[:as]}_type = '#{base_class.name}'" if reflection.options[:as] - dependent_conditions << sanitize_sql(reflection.options[:conditions], reflection.quoted_table_name) if reflection.options[:conditions] + dependent_conditions << sanitize_sql(reflection.options[:conditions], reflection.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('@', '\@') |