From ff0d9b93b9074c479dd6de657c71812f0ac40cbe Mon Sep 17 00:00:00 2001
From: Dave Desrochers <dave726@gmail.com>
Date: Tue, 28 Feb 2012 10:20:27 -0800
Subject: reset_counters() was crashing when there were multiple belongs_to
 associations with the same foreign key.

This closes #5200.
---
 activerecord/test/cases/counter_cache_test.rb | 11 ++++++++++-
 activerecord/test/fixtures/friendships.yml    |  4 ++++
 activerecord/test/fixtures/people.yml         |  3 +++
 activerecord/test/models/friendship.rb        |  4 ++++
 activerecord/test/models/person.rb            |  2 ++
 activerecord/test/schema/schema.rb            |  6 ++++++
 6 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 activerecord/test/fixtures/friendships.yml
 create mode 100644 activerecord/test/models/friendship.rb

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/counter_cache_test.rb b/activerecord/test/cases/counter_cache_test.rb
index cd3d19e783..ee443741ca 100644
--- a/activerecord/test/cases/counter_cache_test.rb
+++ b/activerecord/test/cases/counter_cache_test.rb
@@ -8,9 +8,11 @@ require 'models/category'
 require 'models/categorization'
 require 'models/dog'
 require 'models/dog_lover'
+require 'models/person'
+require 'models/friendship'
 
 class CounterCacheTest < ActiveRecord::TestCase
-  fixtures :topics, :categories, :categorizations, :cars, :dogs, :dog_lovers
+  fixtures :topics, :categories, :categorizations, :cars, :dogs, :dog_lovers, :people, :friendships
 
   class ::SpecialTopic < ::Topic
     has_many :special_replies, :foreign_key => 'parent_id'
@@ -109,4 +111,11 @@ class CounterCacheTest < ActiveRecord::TestCase
       Topic.update_counters([t1.id, t2.id], :replies_count => 2)
     end
   end
+
+  test "reset the right counter if two have the same foreign key" do
+    michael = people(:michael)
+    assert_nothing_raised(ActiveRecord::StatementInvalid) do
+      Person.reset_counters(michael.id, :followers)
+    end
+  end
 end
diff --git a/activerecord/test/fixtures/friendships.yml b/activerecord/test/fixtures/friendships.yml
new file mode 100644
index 0000000000..1ee09175bf
--- /dev/null
+++ b/activerecord/test/fixtures/friendships.yml
@@ -0,0 +1,4 @@
+Connection 1:
+  id: 1
+  person_id: 1
+  friend_id: 2
\ No newline at end of file
diff --git a/activerecord/test/fixtures/people.yml b/activerecord/test/fixtures/people.yml
index 123673a2af..e640a38f1f 100644
--- a/activerecord/test/fixtures/people.yml
+++ b/activerecord/test/fixtures/people.yml
@@ -4,15 +4,18 @@ michael:
   primary_contact_id: 2
   number1_fan_id: 3
   gender: M
+  followers_count: 1
 david:
   id: 2
   first_name: David
   primary_contact_id: 3
   number1_fan_id: 1
   gender: M
+  followers_count: 1
 susan:
   id: 3
   first_name: Susan
   primary_contact_id: 2
   number1_fan_id: 1
   gender: F
+  followers_count: 1
diff --git a/activerecord/test/models/friendship.rb b/activerecord/test/models/friendship.rb
new file mode 100644
index 0000000000..6b4f7acc38
--- /dev/null
+++ b/activerecord/test/models/friendship.rb
@@ -0,0 +1,4 @@
+class Friendship < ActiveRecord::Base
+  belongs_to :friend, class_name: 'Person'
+  belongs_to :follower, foreign_key: 'friend_id', class_name: 'Person', counter_cache: :followers_count
+end
diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb
index e204508986..6e6ff29f77 100644
--- a/activerecord/test/models/person.rb
+++ b/activerecord/test/models/person.rb
@@ -8,6 +8,8 @@ class Person < ActiveRecord::Base
   has_many :posts_with_no_comments, -> { includes(:comments).where('comments.id is null').references(:comments) },
                                     :through => :readers, :source => :post
 
+  has_many :followers, foreign_key: 'friend_id', class_name: 'Friendship'
+
   has_many :references
   has_many :bad_references
   has_many :fixed_bad_references, -> { where :favourite => true }, :class_name => 'BadReference'
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 6c919a2b02..7c45ca27c0 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -270,6 +270,11 @@ ActiveRecord::Schema.define do
     t.string :name
   end
 
+  create_table :friendships, :force => true do |t|
+    t.integer :friend_id
+    t.integer :person_id
+  end
+
   create_table :goofy_string_id, :force => true, :id => false do |t|
     t.string :id, :null => false
     t.string :info
@@ -476,6 +481,7 @@ ActiveRecord::Schema.define do
     t.references :number1_fan
     t.integer    :lock_version, :null => false, :default => 0
     t.string     :comments
+    t.integer    :followers_count, :default => 0
     t.references :best_friend
     t.references :best_friend_of
     t.timestamps
-- 
cgit v1.2.3