From 87e50f104a27b6c6d1452839adef7c7350769071 Mon Sep 17 00:00:00 2001 From: Emilio Tagua Date: Tue, 31 Aug 2010 15:06:02 -0300 Subject: Improved conditionals usage to prevent calling methods. --- .../lib/active_record/relation/query_methods.rb | 27 +++++++++++++++------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index de7e5c7131..5549358fcd 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -43,20 +43,31 @@ module ActiveRecord end def joins(*args) - args.flatten! - args.present? ? clone.tap {|r| r.joins_values += args } : clone + if args.present? + args.flatten! + clone.tap {|r| r.joins_values += args } + else + clone + end end def where(opts, *rest) - value = build_where(opts, rest) - copy = clone - copy.where_values += Array.wrap(value) if value - copy + if value = build_where(opts, rest) + copy = clone + copy.where_values += Array.wrap(value) + copy + else + clone + end end def having(*args) - value = build_where(*args) - value.present? ? clone.tap {|r| r.having_values += Array.wrap(value) } : clone + if args.present? + value = build_where(*args) + clone.tap {|r| r.having_values += Array.wrap(value) } + else + clone + end end def limit(value = true) -- cgit v1.2.3