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/test/cases/associations/inner_join_association_test.rb | |
| 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/test/cases/associations/inner_join_association_test.rb')
| -rw-r--r-- | activerecord/test/cases/associations/inner_join_association_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/inner_join_association_test.rb b/activerecord/test/cases/associations/inner_join_association_test.rb index 4202d28061..68a1e62328 100644 --- a/activerecord/test/cases/associations/inner_join_association_test.rb +++ b/activerecord/test/cases/associations/inner_join_association_test.rb @@ -42,7 +42,7 @@ class InnerJoinAssociationTest < ActiveRecord::TestCase end def test_join_conditions_allow_nil_associations - authors = Author.eager_load(:essays).where(:essays => {:id => nil}) + authors = Author.includes(:essays).where(:essays => {:id => nil}) assert_equal 2, authors.count end |