diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2018-08-11 19:15:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-11 19:15:34 +0200 |
| commit | 76b3c18558b025c111a5e34d3cd39e488eaa5802 (patch) | |
| tree | 17c50747e5d4194bb677cda8f8e15aab824f7137 | |
| parent | f978ddb841ac674ccf4920c41740fbebb320020f (diff) | |
| parent | 77c239e2c92309f96fe7f97b2cadeac2c4994ae0 (diff) | |
| download | rails-76b3c18558b025c111a5e34d3cd39e488eaa5802.tar.gz rails-76b3c18558b025c111a5e34d3cd39e488eaa5802.tar.bz2 rails-76b3c18558b025c111a5e34d3cd39e488eaa5802.zip | |
Merge pull request #33581 from q-centrix/use-strings-on-decorator-method
Use strings instead of symbols on calls to decorate_matching_attribute_types
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 2 |
2 files changed, 2 insertions, 2 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 d2b7817b45..294a3dc32c 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -73,7 +73,7 @@ module ActiveRecord # `skip_time_zone_conversion_for_attributes` would not be picked up. subclass.class_eval do matcher = ->(name, type) { create_time_zone_conversion_attribute?(name, type) } - decorate_matching_attribute_types(matcher, :_time_zone_conversion) do |type| + decorate_matching_attribute_types(matcher, "_time_zone_conversion") do |type| TimeZoneConverter.new(type) end end diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb index 7f096bb532..1030b2368b 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -165,7 +165,7 @@ module ActiveRecord def inherited(subclass) subclass.class_eval do is_lock_column = ->(name, _) { lock_optimistically && name == locking_column } - decorate_matching_attribute_types(is_lock_column, :_optimistic_locking) do |type| + decorate_matching_attribute_types(is_lock_column, "_optimistic_locking") do |type| LockingType.new(type) end end |