From 4c05055487e149bfa4152c1b42f3519671ca22ac Mon Sep 17 00:00:00 2001 From: Will Bryant Date: Sat, 27 Sep 2008 15:28:21 +1200 Subject: 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 [#1110 state:committed] --- activerecord/test/models/author.rb | 2 ++ activerecord/test/models/post.rb | 1 + 2 files changed, 3 insertions(+) (limited to 'activerecord/test/models') 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' -- cgit v1.2.3 From 691aa20280456c332bfaaf69b58adc86fd86a2b8 Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Mon, 13 Oct 2008 19:01:37 +0200 Subject: Ensure methods called on association proxies respect access control. [#1083 state:resolved] [Adam Milligan, Pratik] --- activerecord/test/models/club.rb | 6 ++++++ activerecord/test/models/company.rb | 13 ++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'activerecord/test/models') diff --git a/activerecord/test/models/club.rb b/activerecord/test/models/club.rb index 3ddb691dfb..6e7cdd643a 100644 --- a/activerecord/test/models/club.rb +++ b/activerecord/test/models/club.rb @@ -4,4 +4,10 @@ class Club < ActiveRecord::Base has_many :current_memberships has_one :sponsor has_one :sponsored_member, :through => :sponsor, :source => :sponsorable, :source_type => "Member" + + private + + def private_method + "I'm sorry sir, this is a *private* club, not a *pirate* club" + end end \ No newline at end of file diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb index 0eb8ae0a15..62d20861f3 100644 --- a/activerecord/test/models/company.rb +++ b/activerecord/test/models/company.rb @@ -13,6 +13,12 @@ class Company < AbstractCompany def arbitrary_method "I am Jack's profound disappointment" end + + private + + def private_method + "I am Jack's innermost fears and aspirations" + end end module Namespaced @@ -129,9 +135,14 @@ class Account < ActiveRecord::Base true end - protected def validate errors.add_on_empty "credit_limit" end + + private + + def private_method + "Sir, yes sir!" + end end -- cgit v1.2.3