aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations/inner_join_association_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-04-20 20:06:30 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-04-20 20:06:30 -0700
commit696375ac628bd41edf3a8c8c00dde196696f4add (patch)
tree0b8ca850e462d5d2722ea4d2217d9c132a0e3cb1 /activerecord/test/cases/associations/inner_join_association_test.rb
parent685a53a360d0d8fc4a9f3b49f900621c940a71f2 (diff)
parentb10fb7e7bcb5efea6c93ae52bad125887cfc235c (diff)
downloadrails-696375ac628bd41edf3a8c8c00dde196696f4add.tar.gz
rails-696375ac628bd41edf3a8c8c00dde196696f4add.tar.bz2
rails-696375ac628bd41edf3a8c8c00dde196696f4add.zip
Merge branch 'master' into cherry
Diffstat (limited to 'activerecord/test/cases/associations/inner_join_association_test.rb')
-rw-r--r--activerecord/test/cases/associations/inner_join_association_test.rb5
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 f87c914125..7141531740 100644
--- a/activerecord/test/cases/associations/inner_join_association_test.rb
+++ b/activerecord/test/cases/associations/inner_join_association_test.rb
@@ -29,6 +29,11 @@ class InnerJoinAssociationTest < ActiveRecord::TestCase
assert_match /INNER JOIN .?categories.? ON.*AND.*.?General.?.*TERMINATING_MARKER/, sql
end
+ def test_construct_finder_sql_applies_aliases_tables_on_association_conditions
+ result = Author.find(:all, :joins => [:thinking_posts, :welcome_posts])
+ assert_equal authors(:david), result.first
+ end
+
def test_construct_finder_sql_unpacks_nested_joins
sql = Author.send(:construct_finder_sql, :joins => {:posts => [[:comments]]})
assert_no_match /inner join.*inner join.*inner join/i, sql, "only two join clauses should be present"