diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-09-24 11:28:28 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-09-24 11:28:28 -0700 |
| commit | b93d09dbc59b3b85e7208cd57c92be9d86fd51df (patch) | |
| tree | 160715adb7dcdb53021c5f62e4529042b6b4dc14 /activerecord/lib/active_record/associations/preloader/association.rb | |
| parent | bb9554ad62a3f37738ee7ad99dbbb9a37784c343 (diff) | |
| download | rails-b93d09dbc59b3b85e7208cd57c92be9d86fd51df.tar.gz rails-b93d09dbc59b3b85e7208cd57c92be9d86fd51df.tar.bz2 rails-b93d09dbc59b3b85e7208cd57c92be9d86fd51df.zip | |
push preloaded test up to the factory method so we can eliminate
conditionals from the individual preloaded classes
Diffstat (limited to 'activerecord/lib/active_record/associations/preloader/association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/association.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index 9607afeea2..cdf4a27341 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -21,9 +21,7 @@ module ActiveRecord end def run(preloader) - unless owners.first.association(reflection.name).loaded? - preload(preloader) - end + preload(preloader) end def preload(preloader) |