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/connection_adapters | |
| 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/connection_adapters')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 7 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/oid/bit.rb | 5 |
2 files changed, 2 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb index 0594b4b485..584a86da21 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -151,13 +151,8 @@ module ActiveRecord end 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, :polymorphic, :index, :foreign_key, :type, :options - private + attr_reader :name, :polymorphic, :index, :foreign_key, :type, :options def as_options(value) value.is_a?(Hash) ? value : {} diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/bit.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/bit.rb index 587e95d192..e9a79526f9 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/bit.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/bit.rb @@ -43,10 +43,7 @@ module ActiveRecord /\A[0-9A-F]*\Z/i.match?(value) end - # TODO Change this to private once we've dropped Ruby 2.2 support. - # Workaround for Ruby 2.2 "private attribute?" warning. - protected - + private attr_reader :value end end |