diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-27 08:58:21 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-27 08:58:21 -0700 |
| commit | 991cf78584450973f1c9345849b7415b179727aa (patch) | |
| tree | 2ee96da1ca6b06ae94c77a2c647d347f52ff72de | |
| parent | 1b73dbd36fc5bd2d8ae015a16b2376250ab19b4e (diff) | |
| parent | 5fef8c174ad45fd1a381975816debf8446d09db0 (diff) | |
| download | rails-991cf78584450973f1c9345849b7415b179727aa.tar.gz rails-991cf78584450973f1c9345849b7415b179727aa.tar.bz2 rails-991cf78584450973f1c9345849b7415b179727aa.zip | |
Merge pull request #7768 from kennyj/removing_dead_code_20120928
Removing dead code. attribute_cast_code isn't called.
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/serialization.rb | 10 | ||||
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb | 15 |
2 files changed, 0 insertions, 25 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/serialization.rb b/activerecord/lib/active_record/attribute_methods/serialization.rb index bdda5bc009..6395f92b4b 100644 --- a/activerecord/lib/active_record/attribute_methods/serialization.rb +++ b/activerecord/lib/active_record/attribute_methods/serialization.rb @@ -98,16 +98,6 @@ module ActiveRecord attributes end - - private - - def attribute_cast_code(attr_name) - if serialized_attributes.include?(attr_name) - "v.unserialized_value" - else - super - end - end end def type_cast_attribute_for_write(column, value) diff --git a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb index 9647d03be4..b9a69cdb0a 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -34,21 +34,6 @@ module ActiveRecord module ClassMethods protected - # The enhanced read method automatically converts the UTC time stored in the database to the time - # zone stored in Time.zone. - def attribute_cast_code(attr_name) - column = columns_hash[attr_name] - - if create_time_zone_conversion_attribute?(attr_name, column) - typecast = "v = #{super}" - time_zone_conversion = "v.acts_like?(:time) ? v.in_time_zone : v" - - "((#{typecast}) && (#{time_zone_conversion}))" - else - super - end - end - # Defined for all +datetime+ and +timestamp+ attributes when +time_zone_aware_attributes+ are enabled. # This enhanced write method will automatically convert the time passed to it to the zone stored in Time.zone. def define_method_attribute=(attr_name) |