diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-03-03 11:10:17 -0800 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2012-03-03 11:10:17 -0800 |
| commit | 4443b3647d9e350713eb20a720997ded62b6848e (patch) | |
| tree | 4994d4ba93d72de5332033d93f4891862d8c138a /activerecord/lib/active_record/sanitization.rb | |
| parent | ecf4db15bc6d6574ce93b1658435e162c09d80a1 (diff) | |
| parent | 50725cec397d4fa0ecf1dda4e6ae845a993f1ba7 (diff) | |
| download | rails-4443b3647d9e350713eb20a720997ded62b6848e.tar.gz rails-4443b3647d9e350713eb20a720997ded62b6848e.tar.bz2 rails-4443b3647d9e350713eb20a720997ded62b6848e.zip | |
Merge pull request #5255 from carlosantoniodasilva/active-record-review
Refactor and cleanup in some ActiveRecord modules
Diffstat (limited to 'activerecord/lib/active_record/sanitization.rb')
| -rw-r--r-- | activerecord/lib/active_record/sanitization.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/sanitization.rb b/activerecord/lib/active_record/sanitization.rb index 2d7d83d160..81b13fe529 100644 --- a/activerecord/lib/active_record/sanitization.rb +++ b/activerecord/lib/active_record/sanitization.rb @@ -37,9 +37,9 @@ module ActiveRecord # { :name => nil, :group_id => 4 } returns "name = NULL , group_id='4'" def sanitize_sql_for_assignment(assignments) case assignments - when Array; sanitize_sql_array(assignments) - when Hash; sanitize_sql_hash_for_assignment(assignments) - else assignments + when Array; sanitize_sql_array(assignments) + when Hash; sanitize_sql_hash_for_assignment(assignments) + else assignments end end @@ -57,7 +57,7 @@ module ActiveRecord def expand_hash_conditions_for_aggregates(attrs) expanded_attrs = {} attrs.each do |attr, value| - unless (aggregation = reflect_on_aggregation(attr.to_sym)).nil? + if aggregation = reflect_on_aggregation(attr.to_sym) mapping = aggregate_mapping(aggregation) mapping.each do |field_attr, aggregate_attr| if mapping.size == 1 && !value.respond_to?(aggregate_attr) |