diff options
author | Will Bryant <will.bryant@gmail.com> | 2008-09-27 15:28:21 +1200 |
---|---|---|
committer | Michael Koziarski <michael@koziarski.com> | 2008-10-10 16:58:39 +0200 |
commit | 4c05055487e149bfa4152c1b42f3519671ca22ac (patch) | |
tree | e48d836fa25a2c06544b792f4d72c0f7051be9ee /activerecord/test/models | |
parent | 28393e6e9c9368036e65e77175ea4f65a862259c (diff) | |
download | rails-4c05055487e149bfa4152c1b42f3519671ca22ac.tar.gz rails-4c05055487e149bfa4152c1b42f3519671ca22ac.tar.bz2 rails-4c05055487e149bfa4152c1b42f3519671ca22ac.zip |
explicitly including child associations that are also included in the parent association definition should not result in double records in the collection/double loads (#1110)
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1110 state:committed]
Diffstat (limited to 'activerecord/test/models')
-rw-r--r-- | activerecord/test/models/author.rb | 2 | ||||
-rw-r--r-- | activerecord/test/models/post.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/test/models/author.rb b/activerecord/test/models/author.rb index 37551c8157..e5b19ff9e4 100644 --- a/activerecord/test/models/author.rb +++ b/activerecord/test/models/author.rb @@ -17,6 +17,8 @@ class Author < ActiveRecord::Base proxy_target end end + has_one :post_about_thinking, :class_name => 'Post', :conditions => "posts.title like '%thinking%'" + has_one :post_about_thinking_with_last_comment, :class_name => 'Post', :conditions => "posts.title like '%thinking%'", :include => :last_comment has_many :comments, :through => :posts has_many :comments_containing_the_letter_e, :through => :posts, :source => :comments has_many :comments_with_order_and_conditions, :through => :posts, :source => :comments, :order => 'comments.body', :conditions => "comments.body like 'Thank%'" diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb index 6da37c31ff..e0d8be676a 100644 --- a/activerecord/test/models/post.rb +++ b/activerecord/test/models/post.rb @@ -13,6 +13,7 @@ class Post < ActiveRecord::Base end belongs_to :author_with_posts, :class_name => "Author", :foreign_key => :author_id, :include => :posts + belongs_to :author_with_address, :class_name => "Author", :foreign_key => :author_id, :include => :author_address has_one :last_comment, :class_name => 'Comment', :order => 'id desc' |