diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-20 16:33:07 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-20 19:47:15 -0800 |
| commit | 099a210c837daae692154add3b9da0a207825d35 (patch) | |
| tree | 1f9db8fd9bcaa496333d3b99cf31fe6a52ef739d /activerecord/lib/active_record/attribute_methods | |
| parent | 05168067609b867eb77a99ff3eb39250d22ae046 (diff) | |
| download | rails-099a210c837daae692154add3b9da0a207825d35.tar.gz rails-099a210c837daae692154add3b9da0a207825d35.tar.bz2 rails-099a210c837daae692154add3b9da0a207825d35.zip | |
if there is no base name, we cannot determine a primary key
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/primary_key.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/primary_key.rb b/activerecord/lib/active_record/attribute_methods/primary_key.rb index a10e94d5f7..5ae1ebc9cf 100644 --- a/activerecord/lib/active_record/attribute_methods/primary_key.rb +++ b/activerecord/lib/active_record/attribute_methods/primary_key.rb @@ -24,11 +24,13 @@ module ActiveRecord end def get_primary_key(base_name) #:nodoc: + return unless base_name + case primary_key_prefix_type when :table_name - base_name.to_s.foreign_key(false) + base_name.foreign_key(false) when :table_name_with_underscore - base_name.to_s.foreign_key + base_name.foreign_key else 'id' end |