From b7bcc7e1905062f330e0a84b93a1ecacfea2a4c0 Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Mon, 24 Jan 2011 22:25:32 +0000 Subject: DRY up first/last and hence make last benefit from the bugfix in first --- .../associations/association_collection.rb | 28 ++++++++++------------ 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 5b9f2f99db..a59de18313 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -36,25 +36,12 @@ module ActiveRecord end end - # Fetches the first one using SQL if possible. def first(*args) - if fetch_first_or_last_using_find?(args) - scoped.first(*args) - else - load_target unless loaded? - args.shift if args.first.kind_of?(Hash) && args.first.empty? - @target.first(*args) - end + first_or_last(:first, *args) end - # Fetches the last one using SQL if possible. def last(*args) - if fetch_first_or_last_using_find?(args) - scoped.last(*args) - else - load_target unless loaded? - @target.last(*args) - end + first_or_last(:last, *args) end def to_ary @@ -560,6 +547,17 @@ module ActiveRecord load_target.select { |r| ids.include?(r.id) } end end + + # Fetches the first/last using SQL if possible, otherwise from the target array. + def first_or_last(type, *args) + if fetch_first_or_last_using_find?(args) + scoped.send(type, *args) + else + load_target unless loaded? + args.shift if args.first.kind_of?(Hash) && args.first.empty? + @target.send(type, *args) + end + end end end end -- cgit v1.2.3