diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-12-29 14:26:38 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-12-29 14:27:33 +0000 |
| commit | c99d507fccca2e9e4d12e49b4387e007c5481ae9 (patch) | |
| tree | 269b10745091c0c0e3941ab756cec0130cbc11bd /activerecord/lib/active_record/relation | |
| parent | 0b8b68209ded58e40cc18f3fef2f2c38e3730bb8 (diff) | |
| download | rails-c99d507fccca2e9e4d12e49b4387e007c5481ae9.tar.gz rails-c99d507fccca2e9e4d12e49b4387e007c5481ae9.tar.bz2 rails-c99d507fccca2e9e4d12e49b4387e007c5481ae9.zip | |
Deprecate implicit eager loading. Closes #950.
Diffstat (limited to 'activerecord/lib/active_record/relation')
| -rw-r--r-- | activerecord/lib/active_record/relation/spawn_methods.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb index ba882beca9..a5194beae5 100644 --- a/activerecord/lib/active_record/relation/spawn_methods.rb +++ b/activerecord/lib/active_record/relation/spawn_methods.rb @@ -113,7 +113,7 @@ module ActiveRecord result end - VALID_FIND_OPTIONS = [ :conditions, :include, :joins, :limit, :offset, :extend, + VALID_FIND_OPTIONS = [ :conditions, :include, :joins, :limit, :offset, :extend, :eager_load, :order, :select, :readonly, :group, :having, :from, :lock ] def apply_finder_options(options) @@ -124,7 +124,7 @@ module ActiveRecord finders = options.dup finders.delete_if { |key, value| value.nil? && key != :limit } - ([:joins, :select, :group, :order, :having, :limit, :offset, :from, :lock, :readonly] & finders.keys).each do |finder| + ([:joins, :select, :group, :order, :having, :limit, :offset, :from, :lock, :readonly, :eager_load] & finders.keys).each do |finder| relation = relation.send(finder, finders[finder]) end |