Skip to content
Browse files

Get rid of Model.construct_finder_arel_with_includes. Use construct_f…

…inder_arel instead
  • Loading branch information...
1 parent a9c790e commit c51347152abc7d8a97fd8df3eecfdbfd07673b68 @lifo lifo committed Jan 3, 2010
View
2 activerecord/lib/active_record/associations/association_collection.rb
@@ -58,7 +58,7 @@ def find(*args)
find_scope = construct_scope[:find].slice(:conditions, :order)
with_scope(:find => find_scope) do
- relation = @reflection.klass.send(:construct_finder_arel_with_includes, options)
+ relation = @reflection.klass.send(:construct_finder_arel, options)
case args.first
when :first, :last, :all
View
21 activerecord/lib/active_record/base.rb
@@ -645,7 +645,7 @@ def find(*args)
options = args.extract_options!
set_readonly_option!(options)
- relation = construct_finder_arel_with_includes(options)
+ relation = construct_finder_arel(options)
case args.first
when :first, :last, :all
@@ -1581,17 +1581,7 @@ def construct_finder_arel(options = {}, scope = scope(:find))
offset(construct_offset(options[:offset], scope)).
from(options[:from])
- lock = (scope && scope[:lock]) || options[:lock]
- relation = relation.lock if lock.present?
-
- relation = relation.readonly if options[:readonly]
-
- relation
- end
-
- def construct_finder_arel_with_includes(options = {})
- relation = construct_finder_arel(options)
- include_associations = merge_includes(scope(:find, :include), options[:include])
+ include_associations = merge_includes(scope && scope[:include], options[:include])
if include_associations.any?
if references_eager_loaded_tables?(options)
@@ -1601,6 +1591,11 @@ def construct_finder_arel_with_includes(options = {})
end
end
+ lock = (scope && scope[:lock]) || options[:lock]
+ relation = relation.lock if lock.present?
+
+ relation = relation.readonly if options[:readonly]
+
relation
end
@@ -1722,7 +1717,7 @@ def method_missing(method_id, *arguments, &block)
super unless all_attributes_exists?(attribute_names)
if match.finder?
options = arguments.extract_options!
- relation = options.any? ? construct_finder_arel_with_includes(options) : scoped
+ relation = options.any? ? construct_finder_arel(options) : scoped
relation.send :find_by_attributes, match, attribute_names, *arguments
elsif match.instantiator?
scoped.send :find_or_instantiator_by_attributes, match, attribute_names, *arguments, &block
View
2 activerecord/lib/active_record/named_scope.rb
@@ -29,7 +29,7 @@ def scoped(options = {}, &block)
unless scoped?(:find)
finder_needs_type_condition? ? active_relation.where(type_condition) : active_relation.spawn
else
- construct_finder_arel_with_includes
+ construct_finder_arel
end
end
end

0 comments on commit c513471

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