Merge pull request #15677 from sgrif/sg-less-imperative-pk

Use a conditional rather than early return in `id`
rails · Jun 13, 2014 · 7eb110f · 7eb110f
2 parents 86bbfbc + 607e335
commit 7eb110f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git 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.