From 648c5a1369ed64608c3ca43a5ebc917687d20010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 21 Aug 2012 14:10:33 -0300 Subject: Merge pull request #5210 from Pliny/masteri Fix for #5200 Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/counter_cache.rb --- activerecord/test/models/person.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'activerecord/test/models/person.rb') diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb index dcfea3170c..a64405b246 100644 --- a/activerecord/test/models/person.rb +++ b/activerecord/test/models/person.rb @@ -7,6 +7,8 @@ class Person < ActiveRecord::Base has_many :secure_posts, :through => :secure_readers has_many :posts_with_no_comments, :through => :readers, :source => :post, :include => :comments, :conditions => 'comments.id is null' + has_many :followers, foreign_key: 'friend_id', class_name: 'Friendship' + has_many :references has_many :bad_references has_many :fixed_bad_references, :conditions => { :favourite => true }, :class_name => 'BadReference' -- cgit v1.2.3