diff options
author | Julian Nadeau <julian@jnadeau.ca> | 2016-10-27 13:22:55 -0400 |
---|---|---|
committer | Julian Nadeau <julian@jnadeau.ca> | 2016-10-27 13:22:55 -0400 |
commit | 02063a8e63edf90a5ddca68e14a88191478c2a60 (patch) | |
tree | 76094bec092e420265552a8b47eb330b9c23db0e | |
parent | 7506f3390683fd1329e60385515c3c55b39ff1d5 (diff) | |
download | rails-02063a8e63edf90a5ddca68e14a88191478c2a60.tar.gz rails-02063a8e63edf90a5ddca68e14a88191478c2a60.tar.bz2 rails-02063a8e63edf90a5ddca68e14a88191478c2a60.zip |
Fixes an issue where time_zone_conversion that causes an exception in ARs delegation
Following off of https://github.com/rails/rails/issues/15945, I realized that super
needs to be the first thing that is called in an AbstractModel's inherited method.
I was receiving errors within the inherited method of time_zone_conversion, so I tested
locally by moving super to the top of the method declaration. All exceptions went away.
-rw-r--r-- | activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 bea1514cdf..ce9985e2e1 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -70,6 +70,7 @@ module ActiveRecord private def inherited(subclass) + super # We need to apply this decorator here, rather than on module inclusion. The closure # created by the matcher would otherwise evaluate for `ActiveRecord::Base`, not the # sub class being decorated. As such, changes to `time_zone_aware_attributes`, or @@ -80,7 +81,6 @@ module ActiveRecord TimeZoneConverter.new(type) end end - super end def create_time_zone_conversion_attribute?(name, cast_type) |