aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/attribute_methods
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods')
-rw-r--r--activerecord/lib/active_record/attribute_methods/primary_key.rb6
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