diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-18 16:01:32 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-18 16:01:32 -0300 |
| commit | 051747449e7afc817c599e4135bc629d4de064eb (patch) | |
| tree | 724cd9c1e5041a90b0362466ff442569f271a748 /activerecord/lib/active_record/relation/query_methods.rb | |
| parent | fda195d34af3cd89cf2f3de3ed653f157c76730b (diff) | |
| parent | 14fc8b34521f8354a17e50cd11fa3f809e423592 (diff) | |
| download | rails-051747449e7afc817c599e4135bc629d4de064eb.tar.gz rails-051747449e7afc817c599e4135bc629d4de064eb.tar.bz2 rails-051747449e7afc817c599e4135bc629d4de064eb.zip | |
Merge pull request #6743 from steveklabnik/remove_composed_of
Removing composed_of
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index e0bb84d55a..529ddb5e31 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -562,8 +562,7 @@ module ActiveRecord when String, Array [@klass.send(:sanitize_sql, other.empty? ? opts : ([opts] + other))] when Hash - attributes = @klass.send(:expand_hash_conditions_for_aggregates, opts) - PredicateBuilder.build_from_hash(table.engine, attributes, table) + PredicateBuilder.build_from_hash(table.engine, opts, table) else [opts] end |