Changeset 9075

Timestamp:

03/22/08 02:20:37 (4 months ago)

Author:

bitsweat

Message:

has_one :through supports :source_type. Fix up some tests. References #4756.

Files:

• trunk/activerecord/lib/active_record/association_preload.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations.rb (modified) (1 diff)
• trunk/activerecord/test/cases/associations_test.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/sponsors.yml (modified) (1 diff)
• trunk/activerecord/test/models/club.rb (modified) (1 diff)

trunk/activerecord/lib/active_record/association_preload.rb

@@ -166 +166 @@
-          records.compact.each do |record|
-            proxy = record.send(through_association)
-
-
+
+
+
+
+
+
+
-          end
-          through_records = through_records.flatten

trunk/activerecord/lib/active_record/associations.rb

@@ -1327 +1327 @@
-        def create_has_one_through_reflection(association_id, options)
-          options.assert_valid_keys(
-
+, :source_type
-          )
-          create_reflection(:has_one, association_id, options, self)

trunk/activerecord/test/cases/associations_test.rb

@@ -527 +527 @@
-  
-  def test_has_one_through_eager_loading
-
-2
+, :conditions => ["name = ?", "Groucho Marx"]
+1
-    assert_not_nil assert_no_queries {members[0].club}
-  end
-  
-  def test_has_one_through_eager_loading_through_polymorphic
-
-2
+, :conditions => ["name = ?", "Groucho Marx"]
+1
-    assert_not_nil assert_no_queries {members[0].sponsor_club}    
-  end
+
+  def test_has_one_through_polymorphic_with_source_type
+    assert_equal members(:groucho), clubs(:moustache_club).sponsored_member
+  end
+
+  def test_eager_has_one_through_polymorphic_with_source_type
+    clubs = Club.find(:all, :include => :sponsored_member, :conditions => ["name = ?","Moustache and Eyebrow Fancier Club"])
+    # Only the eyebrow fanciers club has a sponsored_member
+    assert_not_nil assert_no_queries {clubs[0].sponsored_member}
+  end
+
-end
-

trunk/activerecord/test/fixtures/sponsors.yml

@@ -2 +2 @@
-  sponsor_club: moustache_club
-  sponsorable: groucho (Member)
+boring_club_sponsor_for_groucho:
+  sponsor_club: boring_club
+  sponsorable: some_other_guy (Member)
+crazy_club_sponsor_for_groucho:
+  sponsor_club: crazy_club
+  sponsorable: some_other_guy (Member)

trunk/activerecord/test/models/club.rb

@@ -3 +3 @@
-  has_many :members, :through => :memberships
-  has_many :current_memberships
-
+
+
-end