diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-20 16:12:08 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-20 19:32:14 -0800 |
commit | 05168067609b867eb77a99ff3eb39250d22ae046 (patch) | |
tree | 4df2d2e4c00fdf3c4c2969248b4202e1a271f029 /activerecord | |
parent | 3ce3c21997c92cee4123e76d75e39fcfe3d1e209 (diff) | |
download | rails-05168067609b867eb77a99ff3eb39250d22ae046.tar.gz rails-05168067609b867eb77a99ff3eb39250d22ae046.tar.bz2 rails-05168067609b867eb77a99ff3eb39250d22ae046.zip |
remove some lasigns
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/attribute_methods/primary_key.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/primary_key.rb b/activerecord/lib/active_record/attribute_methods/primary_key.rb index 75ae06f5e9..a10e94d5f7 100644 --- a/activerecord/lib/active_record/attribute_methods/primary_key.rb +++ b/activerecord/lib/active_record/attribute_methods/primary_key.rb @@ -24,14 +24,14 @@ module ActiveRecord end def get_primary_key(base_name) #:nodoc: - key = 'id' case primary_key_prefix_type - when :table_name - key = base_name.to_s.foreign_key(false) - when :table_name_with_underscore - key = base_name.to_s.foreign_key + when :table_name + base_name.to_s.foreign_key(false) + when :table_name_with_underscore + base_name.to_s.foreign_key + else + 'id' end - key end # Sets the name of the primary key column to use to the given value, |