diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-20 20:37:03 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-20 20:37:17 +0530 |
| commit | 1fb78e3ed8142782f19877a195f10b1828dd672c (patch) | |
| tree | e238f03953887377cde44d48c192b229b439cf04 /activerecord/lib/active_record/relation/query_methods.rb | |
| parent | 909443eab67c4f07aeb6a294e3858792f075b3ab (diff) | |
| download | rails-1fb78e3ed8142782f19877a195f10b1828dd672c.tar.gz rails-1fb78e3ed8142782f19877a195f10b1828dd672c.tar.bz2 rails-1fb78e3ed8142782f19877a195f10b1828dd672c.zip | |
Base.merge_conditions is no longer needed
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 163d698b5c..bad6fd716b 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -167,8 +167,8 @@ module ActiveRecord builder = PredicateBuilder.new(table.engine) conditions = if [String, Array].include?(args.first.class) - merged = @klass.send(:merge_conditions, args.size > 1 ? Array.wrap(args) : args.first) - Arel::SqlLiteral.new(merged) if merged + sql = @klass.send(:sanitize_sql, args.size > 1 ? args : args.first) + Arel::SqlLiteral.new("(#{sql})") if sql.present? elsif args.first.is_a?(Hash) attributes = @klass.send(:expand_hash_conditions_for_aggregates, args.first) builder.build_from_hash(attributes, table) |