Permalink
Browse files

Improved conditionals usage to prevent calling methods.

  • Loading branch information...
1 parent 2431af1 commit 87e50f104a27b6c6d1452839adef7c7350769071 @miloops miloops committed Aug 31, 2010
Showing with 19 additions and 8 deletions.
  1. +19 −8 activerecord/lib/active_record/relation/query_methods.rb
@@ -43,20 +43,31 @@ def reorder(*args)
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)

0 comments on commit 87e50f1

Please sign in to comment.