kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

skip cloning if arguments are blank

Browse source
This commit is contained in:
Aaron Patterson 2010-11-22 17:23:37 -08:00
parent 4ece7e06fd
commit dc320d5873
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
activerecord/lib/active_record/relation/query_methods.rb
View file

@ -13,7 +13,7 @@ module ActiveRecord
def includes(*args)
args.reject! {|a| a.blank? }
return clone if args.empty?
return self if args.empty?
relation = clone
relation.includes_values = (relation.includes_values + args).flatten.uniq
@ -21,14 +21,18 @@ module ActiveRecord
end
def eager_load(*args)
return self if args.blank?
relation = clone
relation.eager_load_values += args unless args.blank?
relation.eager_load_values += args
relation
end
def preload(*args)
return self if args.blank?
relation = clone
relation.preload_values += args unless args.blank?
relation.preload_values += args
relation
end
@ -43,22 +47,28 @@ module ActiveRecord
end
def group(*args)
return self if args.blank?
relation = clone
relation.group_values += args.flatten unless args.blank?
relation.group_values += args.flatten
relation
end
def order(*args)
return self if args.blank?
relation = clone
relation.order_values += args.flatten unless args.blank?
relation.order_values += args.flatten
relation
end
def joins(*args)
return self if args.blank?
relation = clone
args.flatten!
relation.joins_values += args unless args.blank?
relation.joins_values += args
relation
end
@ -70,14 +80,18 @@ module ActiveRecord
end
def where(opts, *rest)
return self if opts.blank?
relation = clone
relation.where_values += build_where(opts, rest) unless opts.blank?
relation.where_values += build_where(opts, rest)
relation
end
def having(*args)
return self if args.blank?
relation = clone
relation.having_values += build_where(*args) unless args.blank?
relation.having_values += build_where(*args)
relation
end