diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-06-04 07:55:59 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-06-04 07:55:59 -0300 |
| commit | c5c0bad190dff0495612dde2ac4e33f1ee1fa387 (patch) | |
| tree | 7a5eb8075773679fc64b12ab32f7aa77ed5c9e97 /activerecord/test/models | |
| parent | 2a6f4282b91d81dca2c58febc84ed98de9bea466 (diff) | |
| parent | 2c555ec43ad254ab63cf1e572f999f7521c6cb04 (diff) | |
| download | rails-c5c0bad190dff0495612dde2ac4e33f1ee1fa387.tar.gz rails-c5c0bad190dff0495612dde2ac4e33f1ee1fa387.tar.bz2 rails-c5c0bad190dff0495612dde2ac4e33f1ee1fa387.zip | |
Merge pull request #15482 from laurocaetano/fix-regression-for-eager-load
Fix regression on eager loading association based on SQL query rather than existing column.
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test/models')
| -rw-r--r-- | activerecord/test/models/owner.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/activerecord/test/models/owner.rb b/activerecord/test/models/owner.rb index cf24502d3a..2e3a9a3681 100644 --- a/activerecord/test/models/owner.rb +++ b/activerecord/test/models/owner.rb @@ -3,6 +3,18 @@ class Owner < ActiveRecord::Base has_many :pets, -> { order 'pets.name desc' } has_many :toys, :through => :pets + belongs_to :last_pet, class_name: 'Pet' + scope :including_last_pet, -> { + select(%q[ + owners.*, ( + select p.pet_id from pets p + where p.owner_id = owners.owner_id + order by p.name desc + limit 1 + ) as last_pet_id + ]).includes(:last_pet) + } + after_commit :execute_blocks def blocks |