From 099a210c837daae692154add3b9da0a207825d35 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 20 Dec 2010 16:33:07 -0800
Subject: if there is no base name, we cannot determine a primary key

---
 activerecord/lib/active_record/attribute_methods/primary_key.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'activerecord/lib')

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
-- 
cgit v1.2.3