Permalink
Browse files

Add deprecation warning for inferred foreign key. #6029 [Josh Susser]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4992 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 2e09272 commit d52cee3e3bb4c45bfd21d3f905e502fa00758def @technoweenie technoweenie committed Sep 4, 2006
View
@@ -1,5 +1,7 @@
*SVN*
+* Add deprecation warning for inferred foreign key. #6029 [Josh Susser]
+
* Fixed the Ruby/MySQL adapter we ship with Active Record to work with the new authentication handshake that was introduced in MySQL 4.1, along with the other protocol changes made at that time #5723 [jimw@mysql.com]
* Deprecation: use :dependent => :delete_all rather than :exclusively_dependent => true. #6024 [Josh Susser]
@@ -655,6 +655,12 @@ def has_one(association_id, options = {})
# :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]
@@ -350,6 +350,13 @@ def test_save_still_works_after_accessing_nil_has_one
end
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

0 comments on commit d52cee3

Please sign in to comment.