aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-09-08 16:33:16 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-09-08 16:33:16 -0700
commit0db345a39d6890c1869123d9fe3bff5c9b5eef5f (patch)
tree8b320bf29652ee6ee8a15d071962e5a9071cc67d /activerecord
parentcb1f80591e130ecb855965cc3af4e8b6ae0e3397 (diff)
downloadrails-0db345a39d6890c1869123d9fe3bff5c9b5eef5f.tar.gz
rails-0db345a39d6890c1869123d9fe3bff5c9b5eef5f.tar.bz2
rails-0db345a39d6890c1869123d9fe3bff5c9b5eef5f.zip
switch to blank? to avoid method calls
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index a6a3f3df05..7cd391dc1d 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -21,13 +21,13 @@ module ActiveRecord
def eager_load(*args)
relation = clone
- relation.eager_load_values += args if args.present?
+ relation.eager_load_values += args unless args.blank?
relation
end
def preload(*args)
relation = clone
- relation.preload_values += args if args.present?
+ relation.preload_values += args unless args.blank?
relation
end
@@ -43,19 +43,19 @@ module ActiveRecord
def group(*args)
relation = clone
- relation.group_values += args.flatten if args.present?
+ relation.group_values += args.flatten unless args.blank?
relation
end
def order(*args)
relation = clone
- relation.order_values += args.flatten if args.present?
+ relation.order_values += args.flatten unless args.blank?
relation
end
def reorder(*args)
relation = clone
- if args.present?
+ unless args.blank?
relation.order_values = args
relation.reorder_flag = true
end
@@ -285,7 +285,7 @@ module ActiveRecord
def apply_modules(modules)
values = Array.wrap(modules)
- @extensions += values if values.present?
+ @extensions += values unless values.blank?
values.each {|extension| extend(extension) }
end