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

Get rid of Model.construct_finder_arel_with_includes. Use construct_finder_arel instead

Browse source
This commit is contained in:
Pratik Naik 2010-01-03 03:08:01 +05:30
parent a9c790e10f
commit c51347152a
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/lib/active_record/associations/association_collection.rb
View file

@ -58,7 +58,7 @@ module ActiveRecord
find_scope = construct_scope[:find].slice(:conditions, :order) find_scope = construct_scope[:find].slice(:conditions, :order)
with_scope(:find => find_scope) do 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 case args.first
when :first, :last, :all when :first, :last, :all

21
activerecord/lib/active_record/base.rb
View file

@ -645,7 +645,7 @@ module ActiveRecord #:nodoc:
options = args.extract_options! options = args.extract_options!
set_readonly_option!(options) set_readonly_option!(options)
relation = construct_finder_arel_with_includes(options) relation = construct_finder_arel(options)
case args.first case args.first
when :first, :last, :all when :first, :last, :all
@ -1581,17 +1581,7 @@ module ActiveRecord #:nodoc:
offset(construct_offset(options[:offset], scope)). offset(construct_offset(options[:offset], scope)).
from(options[:from]) from(options[:from])
lock = (scope && scope[:lock]) || options[:lock] include_associations = merge_includes(scope && scope[:include], options[:include])
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])
if include_associations.any? if include_associations.any?
if references_eager_loaded_tables?(options) if references_eager_loaded_tables?(options)
@ -1601,6 +1591,11 @@ module ActiveRecord #:nodoc:
end end
end end
lock = (scope && scope[:lock]) || options[:lock]
relation = relation.lock if lock.present?
relation = relation.readonly if options[:readonly]
relation relation
end end
@ -1722,7 +1717,7 @@ module ActiveRecord #:nodoc:
super unless all_attributes_exists?(attribute_names) super unless all_attributes_exists?(attribute_names)
if match.finder? if match.finder?
options = arguments.extract_options! 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 relation.send :find_by_attributes, match, attribute_names, *arguments
elsif match.instantiator? elsif match.instantiator?
scoped.send :find_or_instantiator_by_attributes, match, attribute_names, *arguments, &block scoped.send :find_or_instantiator_by_attributes, match, attribute_names, *arguments, &block

2
activerecord/lib/active_record/named_scope.rb
View file

@ -29,7 +29,7 @@ module ActiveRecord
unless scoped?(:find) unless scoped?(:find)
finder_needs_type_condition? ? active_relation.where(type_condition) : active_relation.spawn finder_needs_type_condition? ? active_relation.where(type_condition) : active_relation.spawn
else else
construct_finder_arel_with_includes construct_finder_arel
end end
end end
end end