diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-29 19:19:08 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-29 19:19:08 -0700 |
commit | 130064d5049cb6df4d0c14964c253d3bad26e001 (patch) | |
tree | 432a6a4515ba6c74509f4ae55fa5aa432d0536cb /activerecord/lib/active_record/attribute_methods/read.rb | |
parent | 648248bbb13aa5259b1e64d9a8376cdbe6717e37 (diff) | |
parent | f50c160cd028bd3e16c46dcba7692439daf709c8 (diff) | |
download | rails-130064d5049cb6df4d0c14964c253d3bad26e001.tar.gz rails-130064d5049cb6df4d0c14964c253d3bad26e001.tar.bz2 rails-130064d5049cb6df4d0c14964c253d3bad26e001.zip |
Merge pull request #5661 from carlosantoniodasilva/ar-pk-typecast
Typecast 'id' attribute in read_attribute when using custom pks
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods/read.rb')
-rw-r--r-- | activerecord/lib/active_record/attribute_methods/read.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb index faed703167..d108de385f 100644 --- a/activerecord/lib/active_record/attribute_methods/read.rb +++ b/activerecord/lib/active_record/attribute_methods/read.rb @@ -67,7 +67,10 @@ module ActiveRecord @attributes_cache.fetch(attr_name.to_s) { |name| column = @columns_hash.fetch(name) { return @attributes.fetch(name) { - @attributes[self.class.primary_key] if name == 'id' + if name == 'id' + primary_key = self.class.primary_key + @columns_hash[primary_key].type_cast(@attributes[primary_key]) + end } } |