diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-03 03:08:01 +0530 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-03 03:08:01 +0530 |
commit | c51347152abc7d8a97fd8df3eecfdbfd07673b68 (patch) | |
tree | faf1ce30c34497be727827faab70ecce62cdd678 /activerecord/lib/active_record/base.rb | |
parent | a9c790e10ffd06294200dbbed4692fbd60424800 (diff) | |
download | rails-c51347152abc7d8a97fd8df3eecfdbfd07673b68.tar.gz rails-c51347152abc7d8a97fd8df3eecfdbfd07673b68.tar.bz2 rails-c51347152abc7d8a97fd8df3eecfdbfd07673b68.zip |
Get rid of Model.construct_finder_arel_with_includes. Use construct_finder_arel instead
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rwxr-xr-x | activerecord/lib/active_record/base.rb | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 7cefba2b82..e77cc6e697 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -645,7 +645,7 @@ module ActiveRecord #:nodoc: 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 @@ module ActiveRecord #:nodoc: 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 @@ module ActiveRecord #:nodoc: 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 @@ module ActiveRecord #:nodoc: 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 |