Changeset 8456

Timestamp:

12/21/07 01:49:01 (5 months ago)

Author:

bitsweat

Message:

Eager belongs_to :include infers the foreign key from the association name rather than the class name. Closes #10517.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations.rb (modified) (2 diffs)
• trunk/activerecord/test/associations/eager_test.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/author.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Eager belongs_to :include infers the foreign key from the association name rather than the class name.  #10517 [Jonathan Viney]
-
-* SQLite: fix rename_ and remove_column for columns with unique indexes.  #10576 [Brandon Keepers]

trunk/activerecord/lib/active_record/associations.rb

@@ -773 +773 @@
-      #   such as <tt>last_name, first_name DESC</tt>
-      # * <tt>:foreign_key</tt> - specify the foreign key used for the association. By default this is guessed to be the name
-ed class in lower-case and +_id+ suffixed. So a +Person+ class that makes a +belongs_to+ association to a
-+Boss+ class will use +boss_id+ as the default +foreign_key
+ion with an +_id+ suffix. So a class that defines a +belongs_to :person+ association will use +person_id+ as the default +foreign_key+.
+Similarly, +belongs_to :favorite_person, :class_name => "Person"+ will use a foreign key of +favorite_person_id
-      # * <tt>:counter_cache</tt> - caches the number of belonging objects on the associate class through the use of +increment_counter+ 
-      #   and +decrement_counter+. The counter cache is incremented when an object of this class is created and decremented when it's
@@ -1708 +1708 @@
-                     reflection.klass.primary_key,
-                     connection.quote_table_name(parent.aliased_table_name),
-klass.to_s.foreign_key
+reflection.primary_key_name
-                    ]
-                else

trunk/activerecord/test/associations/eager_test.rb

@@ -116 +116 @@
-  end
-  
+  def test_eager_association_loading_with_belongs_to_inferred_foreign_key_from_association_name
+    author_favorite = AuthorFavorite.find(:first, :include => :favorite_author)
+    assert_equal authors(:mary), assert_no_queries { author_favorite.favorite_author }
+  end
+
-  def test_eager_association_loading_with_explicit_join
-    posts = Post.find(:all, :include => :comments, :joins => "INNER JOIN authors ON posts.author_id = authors.id AND authors.name = 'Mary'", :limit => 1, :order => 'author_id')

trunk/activerecord/test/fixtures/author.rb

@@ -106 +106 @@
-class AuthorFavorite < ActiveRecord::Base
-  belongs_to :author
-, :foreign_key => 'favorite_author_id'
+
-end