diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2019-08-01 18:43:25 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2019-08-01 18:51:51 +0900 |
| commit | 530f7805ed5790af1d472a041bc74089dc183f47 (patch) | |
| tree | 9c897d7b77cd00127f8a51685506db1e5a4d00c2 /activerecord | |
| parent | 03018cb79be301fb40a57c9ac92a392b1eb8ee61 (diff) | |
| download | rails-530f7805ed5790af1d472a041bc74089dc183f47.tar.gz rails-530f7805ed5790af1d472a041bc74089dc183f47.tar.bz2 rails-530f7805ed5790af1d472a041bc74089dc183f47.zip | |
It may be better to explicitly require 'object/try' where we call `try`
In most cases it works now without explicit require because it's accidentally required through
active_support/core_ext/date_and_time/calculations.rb where we still call `try`,
but that would stop working if we changed the Calculations implementation and remove the require call there.
Diffstat (limited to 'activerecord')
3 files changed, 4 insertions, 0 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 fb44232dff..9a4de1a034 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require "active_support/core_ext/object/try" + module ActiveRecord module AttributeMethods module TimeZoneConversion diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index f33ba87435..d6758c9d4b 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -12,6 +12,7 @@ class ::PG::Connection # :nodoc: end end +require "active_support/core_ext/object/try" require "active_record/connection_adapters/abstract_adapter" require "active_record/connection_adapters/statement_pool" require "active_record/connection_adapters/postgresql/column" diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index d5375390c7..f06a98bd98 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -2,6 +2,7 @@ require "active_record" require "rails" +require "active_support/core_ext/object/try" require "active_model/railtie" # For now, action_controller must always be present with |