diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-16 13:45:25 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-16 13:45:25 -0300 |
| commit | ae297710dd526a95bae99bd143e2bb185466cc23 (patch) | |
| tree | 0114e070dbd19a6efd8dc19f611b1816bbd4f643 /activerecord/test/cases/associations | |
| parent | 678fdda54f391a7fec92e2c0d2a94b6e889c220c (diff) | |
| parent | fbbb6c87fd5e8fcd913c0dbf518024edd7538072 (diff) | |
| download | rails-ae297710dd526a95bae99bd143e2bb185466cc23.tar.gz rails-ae297710dd526a95bae99bd143e2bb185466cc23.tar.bz2 rails-ae297710dd526a95bae99bd143e2bb185466cc23.zip | |
Merge pull request #12011 from jetthoughts/11963_fix_join_with_association_scope
Collapse where constraints to the Arel::Nodes::And node
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test/cases/associations')
| -rw-r--r-- | activerecord/test/cases/associations/inner_join_association_test.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/inner_join_association_test.rb b/activerecord/test/cases/associations/inner_join_association_test.rb index de47a576c6..9fe5ff50d9 100644 --- a/activerecord/test/cases/associations/inner_join_association_test.rb +++ b/activerecord/test/cases/associations/inner_join_association_test.rb @@ -41,6 +41,11 @@ class InnerJoinAssociationTest < ActiveRecord::TestCase assert_no_match(/WHERE/i, sql) end + def test_join_association_conditions_support_string_and_arel_expressions + assert_equal 0, Author.joins(:welcome_posts_with_comment).count + assert_equal 1, Author.joins(:welcome_posts_with_comments).count + end + def test_join_conditions_allow_nil_associations authors = Author.includes(:essays).where(:essays => {:id => nil}) assert_equal 2, authors.count |