diff options
author | Jeremy Daer <jeremydaer@gmail.com> | 2018-02-16 17:14:27 -0800 |
---|---|---|
committer | Jeremy Daer <jeremydaer@gmail.com> | 2018-02-17 10:03:37 -0800 |
commit | 1e526788e6b1d3f42f4d8fdca20e588d42838c80 (patch) | |
tree | 84e6e91540d45de54f4218ad72cca9863723d8be /activerecord/lib/active_record/type/adapter_specific_registry.rb | |
parent | a713fdae4eb4f7ccd34932edc61561a96b8d9f35 (diff) | |
download | rails-1e526788e6b1d3f42f4d8fdca20e588d42838c80.tar.gz rails-1e526788e6b1d3f42f4d8fdca20e588d42838c80.tar.bz2 rails-1e526788e6b1d3f42f4d8fdca20e588d42838c80.zip |
Rails 6 requires Ruby 2.3+
Diffstat (limited to 'activerecord/lib/active_record/type/adapter_specific_registry.rb')
-rw-r--r-- | activerecord/lib/active_record/type/adapter_specific_registry.rb | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/activerecord/lib/active_record/type/adapter_specific_registry.rb b/activerecord/lib/active_record/type/adapter_specific_registry.rb index e7468aa542..357cf862c8 100644 --- a/activerecord/lib/active_record/type/adapter_specific_registry.rb +++ b/activerecord/lib/active_record/type/adapter_specific_registry.rb @@ -52,12 +52,7 @@ module ActiveRecord priority <=> other.priority end - # TODO Change this to private once we've dropped Ruby 2.2 support. - # Workaround for Ruby 2.2 "private attribute?" warning. protected - - attr_reader :name, :block, :adapter, :override - def priority result = 0 if adapter @@ -74,6 +69,7 @@ module ActiveRecord end private + attr_reader :name, :block, :adapter, :override def matches_adapter?(adapter: nil, **) (self.adapter.nil? || adapter == self.adapter) @@ -114,13 +110,8 @@ module ActiveRecord super | 4 end - # TODO Change this to private once we've dropped Ruby 2.2 support. - # Workaround for Ruby 2.2 "private attribute?" warning. - protected - - attr_reader :options, :klass - private + attr_reader :options, :klass def matches_options?(**kwargs) options.all? do |key, value| |