Changeset 8776

Timestamp:

02/02/08 03:27:31 (7 months ago)

Author:

bitsweat

Message:

Fix has_many :through a polymorphic has_many. Closes #10529 [Aleksey Kondratenko]

Files:

• trunk/activerecord/lib/active_record/associations/has_many_through_association.rb (modified) (1 diff)
• trunk/activerecord/test/cases/associations_test.rb (modified) (3 diffs)
• trunk/activerecord/test/fixtures/price_estimates.yml (added)
• trunk/activerecord/test/models/pirate.rb (modified) (1 diff)
• trunk/activerecord/test/models/price_estimate.rb (added)
• trunk/activerecord/test/models/treasure.rb (modified) (1 diff)
• trunk/activerecord/test/schema/schema.rb (modified) (1 diff)

trunk/activerecord/lib/active_record/associations/has_many_through_association.rb

@@ -213 +213 @@
-        def construct_joins(custom_joins = nil)
-          polymorphic_join = nil
-through_reflection.options[:as] || @reflection.
+
-            reflection_primary_key = @reflection.klass.primary_key
-            source_primary_key     = @reflection.source_reflection.primary_key_name

trunk/activerecord/test/cases/associations_test.rb

@@ -17 +17 @@
-require 'models/person'
-require 'models/reader'
+require 'models/parrot'
+require 'models/pirate'
+require 'models/treasure'
+require 'models/price_estimate'
-
-class AssociationsTest < ActiveRecord::TestCase
@@ -1608 +1612 @@
-
-class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
-
+
+
-
-  def test_has_and_belongs_to_many
@@ -2144 +2149 @@
-    end
-  end
+
+  def test_has_many_through_polymorphic_has_manys_works
+    assert_equal [10, 20].to_set, pirates(:redbeard).treasure_estimates.map(&:price).to_set
+  end
-end
-

trunk/activerecord/test/models/pirate.rb

@@ -2 +2 @@
-  belongs_to :parrot
-  has_and_belongs_to_many :parrots
-
+
+
+
-end

trunk/activerecord/test/models/treasure.rb

@@ -2 +2 @@
-  has_and_belongs_to_many :parrots
-  belongs_to :looter, :polymorphic => true
+
+  has_many :price_estimates, :as => :estimate_of
-end

trunk/activerecord/test/schema/schema.rb

@@ -368 +368 @@
-    t.integer :owner_id, :integer
-  end
+
+  create_table :price_estimates, :force => true do |t|
+    t.string :estimate_of_type
+    t.integer :estimate_of_id
+    t.integer :price
+  end
-end