diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-12-31 20:00:24 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-12-31 20:00:45 +0000 |
| commit | 12675988813e82ac30f7c0e0008c12c4cf5d8cdc (patch) | |
| tree | 2856d3a21a139d0c182fc5a99724dc49e39d7eb5 /activerecord/lib/active_record/associations/has_association.rb | |
| parent | 3c400627eb9cfac380d716ccf1182d61db4a45a6 (diff) | |
| download | rails-12675988813e82ac30f7c0e0008c12c4cf5d8cdc.tar.gz rails-12675988813e82ac30f7c0e0008c12c4cf5d8cdc.tar.bz2 rails-12675988813e82ac30f7c0e0008c12c4cf5d8cdc.zip | |
Rename AssociationReflection#primary_key_name to foreign_key, since the options key which it relates to is :foreign_key
Diffstat (limited to 'activerecord/lib/active_record/associations/has_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_association.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/has_association.rb b/activerecord/lib/active_record/associations/has_association.rb index 0ecdb696ea..190fed77c2 100644 --- a/activerecord/lib/active_record/associations/has_association.rb +++ b/activerecord/lib/active_record/associations/has_association.rb @@ -14,9 +14,9 @@ module ActiveRecord def construct_owner_attributes(reflection = @reflection) attributes = {} if reflection.macro == :belongs_to - attributes[reflection.association_primary_key] = @owner.send(reflection.primary_key_name) + attributes[reflection.association_primary_key] = @owner.send(reflection.foreign_key) else - attributes[reflection.primary_key_name] = @owner.send(reflection.active_record_primary_key) + attributes[reflection.foreign_key] = @owner.send(reflection.active_record_primary_key) if reflection.options[:as] attributes["#{reflection.options[:as]}_type"] = @owner.class.base_class.name |