From db8f7272292dec7076412d5426847a6e37f66024 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 28 Sep 2005 09:14:33 +0000 Subject: [PATCH] Ticket #2156 - Use foreign_key inflection uniformly git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2394 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/CHANGELOG | 2 ++ activerecord/lib/active_record/associations.rb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 2eb8c0a98e..2006978b14 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Use foreign_key inflection uniformly. #2156 [Blair Zajac ] + * model.association.clear should destroy associated objects if :dependent => true instead of nullifying their foreign keys. #2221 [joergd@pobox.com, ObieFernandez ] * Returning false from before_destroy should cancel the action. #1829 [Jeremy Huffman] diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index dce4f350e8..b1bc5f9a70 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -442,7 +442,7 @@ module ActiveRecord require_association_class(association_class_name) - association_class_primary_key_name = options[:foreign_key] || Inflector.underscore(Inflector.demodulize(association_class_name)) + "_id" + association_class_primary_key_name = options[:foreign_key] || association_class_name.foreign_key association_accessor_methods(association_name, association_class_name, association_class_primary_key_name, options, BelongsToAssociation) association_constructor_method(:build, association_name, association_class_name, association_class_primary_key_name, options, BelongsToAssociation) @@ -599,7 +599,7 @@ module ActiveRecord ) end - primary_key_name = foreign_key || Inflector.underscore(Inflector.demodulize(name)) + "_id" + primary_key_name = foreign_key || name.foreign_key return association_id.id2name, association_class_name, primary_key_name end