Skip to content
Browse files

Make Model.find(:first, ..) use relations

  • Loading branch information...
1 parent 59cf5e7 commit d6d0fe8c8f68529404d8186634f1f7b5f6f4b32c @lifo lifo committed Dec 27, 2009
Showing with 2 additions and 24 deletions.
  1. +2 −24 activerecord/lib/active_record/base.rb
View
26 activerecord/lib/active_record/base.rb
@@ -645,7 +645,7 @@ def find(*args)
case args.first
when :first
- find_initial(options)
+ construct_finder_arel_with_includes(options).first
when :last
find_last(options)
when :all
@@ -1519,11 +1519,6 @@ def arel_table(table = nil)
end
private
- def find_initial(options)
- options.update(:limit => 1)
- find_every(options).first
- end
-
def find_last(options)
order = options[:order]
@@ -1540,7 +1535,7 @@ def find_last(options)
end
begin
- find_initial(options.merge({ :order => order }))
+ construct_finder_arel_with_includes(options).order(order).first
ensure
scope[:order] = original_scoped_order if original_scoped_order
end
@@ -1558,23 +1553,6 @@ def reverse_sql_order(order_query)
}.join(',')
end
- def find_every(options)
- include_associations = merge_includes(scope(:find, :include), options[:include])
-
- if include_associations.any? && references_eager_loaded_tables?(options)
- records = find_with_associations(options)
- else
- records = find_by_sql(construct_finder_sql(options))
- if include_associations.any?
- preload_associations(records, include_associations)
- end
- end
-
- records.each { |record| record.readonly! } if options[:readonly]
-
- records
- end
-
# Finder methods must instantiate through this method to work with the
# single-table inheritance model that makes it possible to create
# objects of different types from the same table.

0 comments on commit d6d0fe8

Please sign in to comment.
Something went wrong with that request. Please try again.