From cb1f80591e130ecb855965cc3af4e8b6ae0e3397 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 8 Sep 2010 16:06:48 -0700 Subject: refactor to use faster empty? --- activerecord/lib/active_record/relation/query_methods.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (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 038b18079d..a6a3f3df05 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -12,8 +12,10 @@ module ActiveRecord def includes(*args) args.reject! {|a| a.blank? } + return clone if args.empty? + relation = clone - relation.includes_values = (relation.includes_values + args).flatten.uniq if args.present? + relation.includes_values = (relation.includes_values + args).flatten.uniq relation end -- cgit v1.2.3