diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-09-02 15:42:35 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2017-09-02 15:54:26 +0900 |
| commit | 5ea8e528bf3fbb80fc18de76e108f09b87bbc7e6 (patch) | |
| tree | 9c0794a0e0cf09bfe10cb688d70000d3e474c169 /activerecord/test/cases | |
| parent | d24efb79cc438987358f0d4fa3b1da8615a8ed51 (diff) | |
| download | rails-5ea8e528bf3fbb80fc18de76e108f09b87bbc7e6.tar.gz rails-5ea8e528bf3fbb80fc18de76e108f09b87bbc7e6.tar.bz2 rails-5ea8e528bf3fbb80fc18de76e108f09b87bbc7e6.zip | |
Fix preloading through association with custom scope
If `reflection_scope.where_clause` is not empty, `through_scope` should
be joined the source association. But if `values[:references]` in
`reflection_scope` is empty, the source association will not be joined.
It should use `source_reflection.table_name` in that case.
Fixes #22535.
Closes #28763.
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/associations/eager_test.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb index 9fb395853e..3fd2c73efc 100644 --- a/activerecord/test/cases/associations/eager_test.rb +++ b/activerecord/test/cases/associations/eager_test.rb @@ -1307,6 +1307,11 @@ class EagerAssociationTest < ActiveRecord::TestCase assert_equal projects.last.mentor.developers.first.contracts, projects.last.developers.last.contracts end + def test_preloading_has_many_through_with_custom_scope + project = Project.includes(:developers_named_david_with_hash_conditions).find(projects(:active_record).id) + assert_equal [developers(:david)], project.developers_named_david_with_hash_conditions + end + test "scoping with a circular preload" do assert_equal Comment.find(1), Comment.preload(post: :comments).scoping { Comment.find(1) } end |