diff options
| author | Matthew Draper <matthew@trebex.net> | 2014-06-13 09:59:56 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-06-13 09:59:56 +0930 |
| commit | 7eb110f104209208e4c76306775cc3bc6e9f129f (patch) | |
| tree | 01e9fbe09f62a46fed80841d103dc55a59b779bd /activerecord/lib/active_record | |
| parent | 86bbfbc113d7682f4e994bebbf7a60b74ce653ae (diff) | |
| parent | 607e335faeeab965d2ba28a7ca2cbb19e2878c62 (diff) | |
| download | rails-7eb110f104209208e4c76306775cc3bc6e9f129f.tar.gz rails-7eb110f104209208e4c76306775cc3bc6e9f129f.tar.bz2 rails-7eb110f104209208e4c76306775cc3bc6e9f129f.zip | |
Merge pull request #15677 from sgrif/sg-less-imperative-pk
Use a conditional rather than early return in `id`
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/primary_key.rb | 7 |
1 files 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 cb550b0683..1c81a5b71b 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 @@ module ActiveRecord # 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. |