From b4fdfcf6ad4ed7a98eb27a5c416c460a805c1355 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 8 Sep 2010 16:53:17 -0700 Subject: returning arrays lets us avoid Array.wrap --- activerecord/lib/active_record/relation/query_methods.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index c89dd0aec7..b337606f84 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -75,7 +75,7 @@ module ActiveRecord relation = clone if opts.present? - relation.where_values += Array.wrap(build_where(opts, rest)) + relation.where_values += build_where(opts, rest) end relation @@ -85,7 +85,7 @@ module ActiveRecord relation = clone if args.present? - relation.having_values += Array.wrap(build_where(*args)) + relation.having_values += build_where(*args) end relation @@ -216,12 +216,12 @@ module ActiveRecord def build_where(opts, other = []) case opts when String, Array - @klass.send(:sanitize_sql, other.empty? ? opts : ([opts] + other)) + [@klass.send(:sanitize_sql, other.empty? ? opts : ([opts] + other))] when Hash attributes = @klass.send(:expand_hash_conditions_for_aggregates, opts) PredicateBuilder.new(table.engine).build_from_hash(attributes, table) else - opts + [opts] end end -- cgit v1.2.3