github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-04 03:00:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #2156 - Use foreign_key inflection uniformly

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2394 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2005-09-28 09:14:33 +00:00
parent 981763e53e
commit db8f727229
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/CHANGELOG
View File

@@ -1,5 +1,7 @@
*SVN*
* Use foreign_key inflection uniformly. #2156 [Blair Zajac <blair@orcaware.com>]
* model.association.clear should destroy associated objects if :dependent => true instead of nullifying their foreign keys. #2221 [joergd@pobox.com, ObieFernandez <obiefernandez@gmail.com>]
* Returning false from before_destroy should cancel the action. #1829 [Jeremy Huffman]

4
activerecord/lib/active_record/associations.rb
View File

@@ -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