From 207f266ccaaa9cd04cd2a7513ae5598c4358b510 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 20 Dec 2010 17:33:26 -0800
Subject: define_attr_method must serialize nil correctly

---
 activerecord/lib/active_record/attribute_methods/primary_key.rb | 8 ++++++--
 1 file changed, 6 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 5ae1ebc9cf..c016e936cb 100644
--- a/activerecord/lib/active_record/attribute_methods/primary_key.rb
+++ b/activerecord/lib/active_record/attribute_methods/primary_key.rb
@@ -24,7 +24,7 @@ module ActiveRecord
         end
 
         def get_primary_key(base_name) #:nodoc:
-          return unless base_name
+          return unless base_name && !base_name.blank?
 
           case primary_key_prefix_type
           when :table_name
@@ -32,7 +32,11 @@ module ActiveRecord
           when :table_name_with_underscore
             base_name.foreign_key
           else
-            'id'
+            if ActiveRecord::Base != self && connection.table_exists?(table_name)
+              connection.primary_key(table_name)
+            else
+              'id'
+            end
           end
         end
 
-- 
cgit v1.2.3