diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-01-13 23:42:07 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-01-16 21:17:17 +0000 |
| commit | d13627d532f23b248a9141511c16abdf5746a486 (patch) | |
| tree | b307474e4ba22771acaedf9cba0a237e2219aad4 /activerecord/lib/active_record/associations/preloader | |
| parent | 247d274cabae827766c1c5b9deb34fb34548fc5e (diff) | |
| download | rails-d13627d532f23b248a9141511c16abdf5746a486.tar.gz rails-d13627d532f23b248a9141511c16abdf5746a486.tar.bz2 rails-d13627d532f23b248a9141511c16abdf5746a486.zip | |
Revert "Deprecate implicit eager loading. Closes #950."
This reverts commit c99d507fccca2e9e4d12e49b4387e007c5481ae9.
Diffstat (limited to 'activerecord/lib/active_record/associations/preloader')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/association.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/through_association.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index 298decb0f1..779f8164cc 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -100,7 +100,6 @@ module ActiveRecord scope = scope.select(preload_options[:select] || options[:select] || table[Arel.star]) scope = scope.includes(preload_options[:include] || options[:include]) - scope = scope.eager_load(preload_options[:eager_load] || options[:eager_load]) if options[:as] scope = scope.where( diff --git a/activerecord/lib/active_record/associations/preloader/through_association.rb b/activerecord/lib/active_record/associations/preloader/through_association.rb index 97898c53ae..ad6374d09a 100644 --- a/activerecord/lib/active_record/associations/preloader/through_association.rb +++ b/activerecord/lib/active_record/associations/preloader/through_association.rb @@ -53,7 +53,6 @@ module ActiveRecord else if options[:conditions] through_options[:include] = options[:include] || options[:source] - through_options[:eager_load] = options[:eager_load] || options[:source] through_options[:conditions] = options[:conditions] end |