Changeset 7188

Timestamp:

07/16/07 20:21:36 (10 months ago)

Author:

rick

Message:

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

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/reflection.rb (modified) (1 diff)
• trunk/activerecord/test/associations_test.rb (modified) (1 diff)
• trunk/activerecord/test/reflection_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Change belongs_to so that the foreign_key assumption is taken from the association name, not the class name.  Closes #8992 [hasmanyjosh]
+
+  OLD
+    belongs_to :visitor, :class_name => 'User' # => inferred foreign_key is user_id
+    
+  NEW
+    belongs_to :visitor, :class_name => 'User' # => inferred foreign_key is visitor_id
-
-* Remove spurious tests from deprecated_associations_test, most of these aren't deprecated, and are duplicated in associations_test.  Closes #8987 [lifofifo]

trunk/activerecord/lib/active_record/associations.rb

@@ -800 +800 @@
-      #   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)
-        

trunk/activerecord/lib/active_record/reflection.rb

@@ -208 +208 @@
-        def derive_primary_key_name
-          if macro == :belongs_to
-class_name.foreign_key
+"#{name}_id"
-          elsif options[:as]
-            "#{options[:as]}_id"

trunk/activerecord/test/associations_test.rb

@@ -410 +410 @@
-  end
-
-  def test_deprecated_inferred_foreign_key
-    assert_not_deprecated { Company.belongs_to :firm }
-    assert_not_deprecated { Company.belongs_to :client, :foreign_key => "firm_id" }
-    assert_not_deprecated { Company.belongs_to :firm, :class_name => "Firm", :foreign_key => "client_of" }
-    assert_deprecated("inferred foreign_key name") { Company.belongs_to :client, :class_name => "Firm" }
-  end
-
-end
-

trunk/activerecord/test/reflection_test.rb

@@ -112 +112 @@
-  end
-
+  def test_belongs_to_inferred_foreign_key_from_assoc_name
+    Company.belongs_to :foo
+    assert_equal "foo_id", Company.reflect_on_association(:foo).primary_key_name
+    Company.belongs_to :bar, :class_name => "Xyzzy"
+    assert_equal "bar_id", Company.reflect_on_association(:bar).primary_key_name
+    Company.belongs_to :baz, :class_name => "Xyzzy", :foreign_key => "xyzzy_id"
+    assert_equal "xyzzy_id", Company.reflect_on_association(:baz).primary_key_name
+  end
+
-  def test_association_reflection_in_modules
-    assert_reflection MyApplication::Business::Firm,