Changeset 3756

Timestamp:

03/04/06 15:11:17 (3 years ago)

Author:

minam

Message:

Make counter_cache work with polymorphic belongs_to

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations.rb (modified) (1 diff)
• trunk/activerecord/test/associations_join_model_test.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/db_definitions/schema.rb (modified) (2 diffs)
• trunk/activerecord/test/fixtures/tagging.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make counter_cache work with polymorphic belongs_to [Jamis Buck]
-
-* Fixed that calling HasOneProxy#build_model repeatedly would cause saving to happen #4058 [anna@wota.jp]

trunk/activerecord/lib/active_record/associations.rb

@@ -507 +507 @@
-          end
-      
-          if options[:counter_cache]
-            module_eval(
-              "after_create '#{reflection.class_name}.increment_counter(\"#{self.to_s.underscore.pluralize + "_count"}\", #{reflection.primary_key_name})" +
-              " unless #{reflection.name}.nil?'"
-            )
-
-            module_eval(
-              "before_destroy '#{reflection.class_name}.decrement_counter(\"#{self.to_s.underscore.pluralize + "_count"}\", #{reflection.primary_key_name})" +
-              " unless #{reflection.name}.nil?'"
-            )          
-          end
-
-          # deprecated api
-          deprecated_has_association_method(reflection.name)
-          deprecated_association_comparison_method(reflection.name, reflection.class_name)
+        end
+
+        if options[:counter_cache]
+          module_eval(
+            "after_create '#{reflection.name}.class.increment_counter(\"#{self.to_s.underscore.pluralize + "_count"}\", #{reflection.primary_key_name})" +
+            " unless #{reflection.name}.nil?'"
+          )
+
+          module_eval(
+            "before_destroy '#{reflection.name}.class.decrement_counter(\"#{self.to_s.underscore.pluralize + "_count"}\", #{reflection.primary_key_name})" +
+            " unless #{reflection.name}.nil?'"
+          )          
-        end
-      end

trunk/activerecord/test/associations_join_model_test.rb

@@ -105 +105 @@
-    assert_equal [authors(:mary)], posts(:authorless).authors
-  end
+
+  def test_belongs_to_polymorphic_with_counter_cache
+    assert_equal 0, posts(:welcome)[:taggings_count]
+    tagging = posts(:welcome).taggings.create(:tag => tags(:general))
+    assert_equal 1, posts(:welcome, :reload)[:taggings_count]
+    tagging.destroy
+    assert posts(:welcome, :reload)[:taggings_count].zero?
+  end
-end

trunk/activerecord/test/fixtures/db_definitions/schema.rb

@@ -9 +9 @@
-  create_table "tags", :force => true do |t|
-    t.column "name", :string
+    t.column :taggings_count, :integer, :default => 0
-  end
-
@@ -17 +18 @@
-  end
-
+  add_column :posts, :taggings_count, :integer, :default => 0
+
-end

trunk/activerecord/test/fixtures/tagging.rb

@@ -1 +1 @@
-class Tagging < ActiveRecord::Base
-  belongs_to :tag
-
+, :counter_cache => true
-end