Change belongs_to so that the foreign_key assumption is taken from the association name, not the class name. Closes #8992 [hasmanyjosh]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7188 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 1 insertions, 7 deletions

diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index ca739eb5dc..b9839a8500 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -799,12 +799,6 @@ module ActiveRecord
       #              :conditions => 'discounts > #{payments_count}'
       #   belongs_to :attachable, :polymorphic => true
       def belongs_to(association_id, options = {})
-        if options.include?(:class_name) && !options.include?(:foreign_key)
-          ::ActiveSupport::Deprecation.warn(
-          "The inferred foreign_key name will change in Rails 2.0 to use the association name instead of its class name when they differ.  When using :class_name in belongs_to, use the :foreign_key option to explicitly set the key name to avoid problems in the transition.",
-          caller)
-        end
-        
         reflection = create_belongs_to_reflection(association_id, options)
         
         if reflection.options[:polymorphic]
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index 62184eeff2..3d76ffe776 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -207,7 +207,7 @@ module ActiveRecord
 
         def derive_primary_key_name
           if macro == :belongs_to
-            class_name.foreign_key
+            "#{name}_id"
           elsif options[:as]
             "#{options[:as]}_id"
           else