From 607e335faeeab965d2ba28a7ca2cbb19e2878c62 Mon Sep 17 00:00:00 2001
From: Sean Griffin <sean@thoughtbot.com>
Date: Thu, 12 Jun 2014 18:21:01 -0600
Subject: [PATCH] Use a conditional rather than early return in `id`

---
 .../lib/active_record/attribute_methods/primary_key.rb     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/activerecord/lib/active_record/attribute_methods/primary_key.rb b/activerecord/lib/active_record/attribute_methods/primary_key.rb
index cb550b0683ff2..1c81a5b71bcbb 100644
--- a/activerecord/lib/active_record/attribute_methods/primary_key.rb
+++ b/activerecord/lib/active_record/attribute_methods/primary_key.rb
@@ -15,9 +15,10 @@ def to_key
 
       # Returns the primary key value.
       def id
-        return unless self.class.primary_key
-        sync_with_transaction_state
-        read_attribute(self.class.primary_key)
+        if pk = self.class.primary_key
+          sync_with_transaction_state
+          read_attribute(pk)
+        end
       end
 
       # Sets the primary key value.