Changeset 8762

Timestamp:

01/31/08 07:50:15 (4 months ago)

Author:

bitsweat

Message:

Fixed preloading belongs_to associations which reference a custom foreign key. References #9640.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/association_preload.rb (modified) (2 diffs)
• trunk/activerecord/test/cases/associations/eager_test.rb (modified) (2 diffs)
• trunk/activerecord/test/fixtures/owners.yml (added)
• trunk/activerecord/test/fixtures/pets.yml (added)
• trunk/activerecord/test/models/owner.rb (added)
• trunk/activerecord/test/models/pet.rb (added)
• trunk/activerecord/test/schema/schema.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -5 +5 @@
-* belongs_to supports :dependent => :destroy and :delete.  #10592 [Jonathan Viney]
-
-
+, codafoo
-
-* Support aggregations in finder conditions.  #10572 [Ryan Kinderman]

trunk/activerecord/lib/active_record/association_preload.rb

@@ -181 +181 @@
-
-          table_name = klass.table_name
+          primary_key = klass.primary_key
-          conditions = "#{table_name}.#{primary_key} IN (?)"
-          conditions << append_conditions(options, preload_options)
@@ -188 +189 @@
-                                          :joins => options[:joins],
-                                          :order => options[:order])
-'id'
+primary_key
-        end
-      end

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

@@ -8 +8 @@
-require 'models/person'
-require 'models/reader'
+require 'models/owner'
+require 'models/pet'
-
-class EagerAssociationTest < ActiveRecord::TestCase
-  fixtures :posts, :comments, :authors, :categories, :categories_posts,
-
+
+
-
-  def test_loading_with_one_association
@@ -72 +75 @@
-  def test_loading_with_no_associations
-    assert_nil Post.find(posts(:authorless).id, :include => :author).author
+  end
+
+  def test_eager_association_loading_with_belongs_to_and_foreign_keys
+    pets = Pet.find(:all, :include => :owner)
+    assert_equal 3, pets.length
-  end
-

trunk/activerecord/test/schema/schema.rb

@@ -359 +359 @@
-    t.integer :value
-  end
+
+  create_table :owners, :primary_key => :owner_id ,:force => true do |t|
+    t.string :name
+  end
+
+  create_table :pets, :primary_key => :pet_id ,:force => true do |t|
+    t.string :name
+    t.integer :owner_id, :integer
+  end
-end