0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Allow association redefinition in subclasses.  #9346 [wildchild]
0
+
0
 * Fix has_many :through delete with custom foreign keys.  #6466 [naffis]
0
 
0
 * Fix regression where the association would not construct new finder SQL on save causing bogus queries for "WHERE owner_id = NULL" even after owner was saved.  #8713 [Bryan Helmkamp]

0
@@ -868,7 +868,7 @@ module ActiveRecord
0
         # Don't use a before_destroy callback since users' before_destroy
0
         # callbacks will be executed after the association is wiped out.
0
         old_method = "destroy_without_habtm_shim_for_#{reflection.name}"
0
-        class_eval <<-end_eval
0
+        class_eval <<-end_eval unless method_defined?(old_method)
0
           alias_method :#{old_method}, :destroy_without_callbacks
0
           def destroy_without_callbacks
0
             #{reflection.name}.clear
0
@@ -1292,7 +1292,9 @@ module ActiveRecord
0
             defined_callbacks = options[callback_name.to_sym]
0
             if options.has_key?(callback_name.to_sym)
0
               class_inheritable_reader full_callback_name.to_sym
0
-              write_inheritable_array(full_callback_name.to_sym, [defined_callbacks].flatten)
0
+              write_inheritable_attribute(full_callback_name.to_sym, [defined_callbacks].flatten)
0
+            else
0
+              write_inheritable_attribute(full_callback_name.to_sym, [])
0
             end
0
           end
0
         end

0
@@ -93,3 +93,21 @@ class AggregationsTest < Test::Unit::TestCase
0
     assert_raises(NoMethodError) { customers(:david).balance = nil }
0
   end
0
 end
0
+
0
+class OverridingAggregationsTest < Test::Unit::TestCase
0
+  class Name; end
0
+  class DifferentName; end
0
+
0
+  class Person   < ActiveRecord::Base
0
+    composed_of :composed_of, :mapping => %w(person_first_name first_name)
0
+  end
0
+
0
+  class DifferentPerson < Person
0
+    composed_of :composed_of, :class_name => 'DifferentName', :mapping => %w(different_person_first_name first_name)
0
+  end
0
+
0
+  def test_composed_of_aggregation_redefinition_reflections_should_differ_and_not_inherited
0
+    assert_not_equal Person.reflect_on_aggregation(:composed_of),
0
+                     DifferentPerson.reflect_on_aggregation(:composed_of)
0
+  end
0
+end

0
@@ -1850,3 +1850,68 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
0
     assert_equal %w(1 2), projects.scan(/\d/).sort
0
   end
0
 end
0
+
0
+
0
+class OverridingAssociationsTest < Test::Unit::TestCase
0
+  class Person < ActiveRecord::Base; end
0
+  class DifferentPerson < ActiveRecord::Base; end
0
+
0
+  class PeopleList < ActiveRecord::Base
0
+    has_and_belongs_to_many :has_and_belongs_to_many, :before_add => :enlist
0
+    has_many :has_many, :before_add => :enlist
0
+    belongs_to :belongs_to
0
+    has_one :has_one
0
+  end
0
+
0
+  class DifferentPeopleList < PeopleList
0
+    # Different association with the same name, callbacks should be omitted here.
0
+    has_and_belongs_to_many :has_and_belongs_to_many, :class_name => 'DifferentPerson'
0
+    has_many :has_many, :class_name => 'DifferentPerson'
0
+    belongs_to :belongs_to, :class_name => 'DifferentPerson', :foreign_key => 'belongs_to_id'
0
+    has_one :has_one, :class_name => 'DifferentPerson'
0
+  end
0
+
0
+  def test_habtm_association_redefinition_callbacks_should_differ_and_not_inherited
0
+    # redeclared association on AR descendant should not inherit callbacks from superclass
0
+    callbacks = PeopleList.read_inheritable_attribute(:before_add_for_has_and_belongs_to_many)
0
+    assert_equal([:enlist], callbacks)
0
+    callbacks = DifferentPeopleList.read_inheritable_attribute(:before_add_for_has_and_belongs_to_many)
0
+    assert_equal([], callbacks)
0
+  end
0
+
0
+  def test_has_many_association_redefinition_callbacks_should_differ_and_not_inherited
0
+    # redeclared association on AR descendant should not inherit callbacks from superclass
0
+    callbacks = PeopleList.read_inheritable_attribute(:before_add_for_has_many)
0
+    assert_equal([:enlist], callbacks)
0
+    callbacks = DifferentPeopleList.read_inheritable_attribute(:before_add_for_has_many)
0
+    assert_equal([], callbacks)
0
+  end
0
+
0
+  def test_habtm_association_redefinition_reflections_should_differ_and_not_inherited
0
+    assert_not_equal(
0
+      PeopleList.reflect_on_association(:has_and_belongs_to_many),
0
+      DifferentPeopleList.reflect_on_association(:has_and_belongs_to_many)
0
+    )
0
+  end
0
+
0
+  def test_has_many_association_redefinition_reflections_should_differ_and_not_inherited
0
+    assert_not_equal(
0
+      PeopleList.reflect_on_association(:has_many),
0
+      DifferentPeopleList.reflect_on_association(:has_many)
0
+    )
0
+  end
0
+
0
+  def test_belongs_to_association_redefinition_reflections_should_differ_and_not_inherited
0
+    assert_not_equal(
0
+      PeopleList.reflect_on_association(:belongs_to),
0
+      DifferentPeopleList.reflect_on_association(:belongs_to)
0
+    )
0
+  end
0
+
0
+  def test_has_one_association_redefinition_reflections_should_differ_and_not_inherited
0
+    assert_not_equal(
0
+      PeopleList.reflect_on_association(:has_one),
0
+      DifferentPeopleList.reflect_on_association(:has_one)
0
+    )
0
+  end
0
+end