Changeset 9067

Timestamp:

03/21/08 18:09:03 (2 years ago)

Author:

rick

Message:

Add has_one :through support, finally. Closes #4756 [thechrisoshow]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/association_preload.rb (modified) (3 diffs)
• trunk/activerecord/lib/active_record/associations.rb (modified) (5 diffs)
• trunk/activerecord/lib/active_record/associations/has_one_through_association.rb (added)
• trunk/activerecord/test/cases/associations_test.rb (modified) (3 diffs)
• trunk/activerecord/test/cases/associations/join_model_test.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/clubs.yml (added)
• trunk/activerecord/test/fixtures/members.yml (added)
• trunk/activerecord/test/fixtures/memberships.yml (added)
• trunk/activerecord/test/fixtures/sponsors.yml (added)
• trunk/activerecord/test/models/club.rb (added)
• trunk/activerecord/test/models/member.rb (added)
• trunk/activerecord/test/models/membership.rb (added)
• trunk/activerecord/test/models/sponsor.rb (added)
• trunk/activerecord/test/schema/schema.rb (modified) (3 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add has_one :through support.  #4756 [thechrisoshow]
-
-* Migrations: create_table supports primary_key_prefix_type.  #10314 [student, thechrisoshow]

trunk/activerecord/lib/active_record/association_preload.rb

@@ -49 +49 @@
-        end
-      end
+      
+      def add_preloaded_record_to_collection(parent_records, reflection_name, associated_record)
+        parent_records.each do |parent_record|
+          association_proxy = parent_record.send(reflection_name)
+          association_proxy.loaded
+          association_proxy.target = associated_record
+        end
+      end
-
-      def set_association_collection_records(id_to_record_map, reflection_name, associated_records, key)
@@ -98 +106 @@
-
-      def preload_has_one_association(records, reflection, preload_options={})
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-
@@ -127 +151 @@
-        end
-      end
-
+
-      def preload_through_records(records, reflection, through_association)
-        through_reflection = reflections[through_association]

trunk/activerecord/lib/active_record/associations.rb

@@ -7 +7 @@
-require 'active_record/associations/has_many_through_association'
-require 'active_record/associations/has_and_belongs_to_many_association'
+require 'active_record/associations/has_one_through_association'
-
-module ActiveRecord
@@ -738 +739 @@
-      # * <tt>:include</tt>  - specify second-order associations that should be eager loaded when this object is loaded.
-      # * <tt>:as</tt>: Specifies a polymorphic interface (See <tt>#belongs_to</tt>).
+      # * <tt>:through</tt>: Specifies a Join Model through which to perform the query.  Options for <tt>:class_name</tt> and <tt>:foreign_key</tt>
+      #   are ignored, as the association uses the source reflection. You can only use a <tt>:through</tt> query through a 
+      #   <tt>has_one</tt> or <tt>belongs_to</tt> association on the join model.
+      # * <tt>:source</tt>: Specifies the source association name used by <tt>has_one :through</tt> queries.  Only use it if the name cannot be
+      #   inferred from the association.  <tt>has_one :favorite, :through => :favorites</tt> will look for a
+      #   <tt>:favorite</tt> on +Favorite+, unless a <tt>:source</tt> is given.      
-      # * <tt>:readonly</tt> - if set to +true+, the associated object is readonly through the association.
-      #
@@ -747 +754 @@
-      #   has_one :attachment, :as => :attachable
-      #   has_one :boss, :readonly => :true
+      #   has_one :club, :through => :membership
+      #   has_one :primary_address, :through => :addressables, :conditions => ["addressable.primary = ?", true], :source => :addressable
-      def has_one(association_id, options = {})
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-
@@ -1059 +1073 @@
-            end
-
-
+
+
+
+
+
+
-
-            instance_variable_set(ivar, new_value.nil? ? nil : association)
@@ -1299 +1318 @@
-          )
-
+          create_reflection(:has_one, association_id, options, self)
+        end
+        
+        def create_has_one_through_reflection(association_id, options)
+          options.assert_valid_keys(
+            :class_name, :foreign_key, :remote, :conditions, :order, :include, :dependent, :counter_cache, :extend, :as, :through, :source
+          )
-          create_reflection(:has_one, association_id, options, self)
-        end

trunk/activerecord/test/cases/associations_test.rb

@@ -21 +21 @@
-require 'models/treasure'
-require 'models/price_estimate'
+require 'models/club'
+require 'models/member'
+require 'models/membership'
+require 'models/sponsor'
-
-class AssociationsTest < ActiveRecord::TestCase
@@ -187 +191 @@
-    assert_equal Account.find(1).credit_limit, companies(:first_firm).account.credit_limit
-  end
-
+
-  def test_has_one_cache_nils
-    firm = companies(:another_firm)
@@ -477 +481 @@
-end
-
+class HasOneThroughAssociationsTest < ActiveRecord::TestCase
+  fixtures :members, :clubs, :memberships, :sponsors
+  
+  def setup
+    @member = members(:groucho)
+  end
+
+  def test_has_one_through_with_has_one
+    assert_equal clubs(:boring_club), @member.club
+  end
+
+  def test_has_one_through_with_has_many
+    assert_equal clubs(:moustache_club), @member.favourite_club
+  end
+  
+  def test_creating_association_creates_through_record
+    new_member = Member.create(:name => "Chris")
+    new_member.club = Club.create(:name => "LRUG")
+    assert_not_nil new_member.current_membership
+    assert_not_nil new_member.club
+  end
+  
+  def test_replace_target_record
+    new_club = Club.create(:name => "Marx Bros")
+    @member.club = new_club
+    @member.reload
+    assert_equal new_club, @member.club
+  end
+  
+  def test_replacing_target_record_deletes_old_association
+    assert_no_difference "Membership.count" do
+      new_club = Club.create(:name => "Bananarama")
+      @member.club = new_club
+      @member.reload      
+    end
+  end
+  
+  def test_has_one_through_polymorphic
+    assert_equal clubs(:moustache_club), @member.sponsor_club
+  end
+  
+  def has_one_through_to_has_many
+    assert_equal 2, @member.fellow_members.size
+  end
+  
+  def test_has_one_through_eager_loading
+    members = Member.find(:all, :include => :club)
+    assert_equal 2, members.size
+    assert_not_nil assert_no_queries {members[0].club}
+  end
+  
+  def test_has_one_through_eager_loading_through_polymorphic
+    members = Member.find(:all, :include => :sponsor_club)
+    assert_equal 2, members.size
+    assert_not_nil assert_no_queries {members[0].sponsor_club}    
+  end
+end
-
-class HasManyAssociationsTest < ActiveRecord::TestCase

trunk/activerecord/test/cases/associations/join_model_test.rb

@@ -632 +632 @@
-    end
-  end
-
+
-  private
-    # create dynamic Post models to allow different dependency options

trunk/activerecord/test/schema/schema.rb

@@ -50 +50 @@
-      t.integer :post_id, :null => false
-    end
+    
+    create_table :clubs, :force => true do |t|
+      t.string :name
+    end
-
-    create_table :colnametests, :force => true do |t|
@@ -116 +120 @@
-      t.integer :tps_report_number
-      t.integer :version, :null => false, :default => 0
+    end
+
+    create_table :members, :force => true do |t|
+      t.string :name
+    end
+
+    create_table :memberships, :force => true do |t|
+      t.datetime :joined_on
+      t.integer :club_id, :member_id
+      t.boolean :favourite, :default => false
+      t.string :type
-    end
-
@@ -177 +192 @@
-      t.integer :post_id, :null => false
-      t.integer :person_id, :null => false
+    end
+    
+    create_table :sponsors, :force => true do |t|
+      t.integer :club_id
+      t.integer :sponsorable_id
+      t.integer :sponsorable_type
-    end
-