Merge pull request #5661 from carlosantoniodasilva/ar-pk-typecast

Typecast 'id' attribute in read_attribute when using custom pks

3 files changed, 8 insertions, 5 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
             }
           }
 
diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb
index 78e54c4c9b..b7e1513422 100644
--- a/activerecord/lib/active_record/connection_adapters/column.rb
+++ b/activerecord/lib/active_record/connection_adapters/column.rb
@@ -1,4 +1,5 @@
 require 'set'
+require 'active_support/deprecation'
 
 module ActiveRecord
   # :stopdoc:
@@ -107,6 +108,9 @@ module ActiveRecord
       end
 
       def type_cast_code(var_name)
+        ActiveSupport::Deprecation.warn("Column#type_cast_code is deprecated in favor of" \
+          "using Column#type_cast only, and it is going to be removed in future Rails versions.")
+
         klass = self.class.name
 
         case type
diff --git a/activerecord/test/cases/attribute_methods/read_test.rb b/activerecord/test/cases/attribute_methods/read_test.rb
index 764305459d..98c38535a6 100644
--- a/activerecord/test/cases/attribute_methods/read_test.rb
+++ b/activerecord/test/cases/attribute_methods/read_test.rb
@@ -6,10 +6,6 @@ module ActiveRecord
   module AttributeMethods
     class ReadTest < ActiveRecord::TestCase
       class FakeColumn < Struct.new(:name)
-        def type_cast_code(var)
-          var
-        end
-
         def type; :integer; end
       end