diff options
author | Matthew Draper <matthew@trebex.net> | 2017-03-13 21:46:13 +1030 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-13 21:46:13 +1030 |
commit | bc619fb05df516c404d42fb2a13d29b192a07a7e (patch) | |
tree | d8e68737407a68bc3f86eb89b308245b81c1c811 | |
parent | 11f10840936a323eda1a9eab02521eff9bdccedb (diff) | |
parent | 32b11879d8f14fed9ceca93864ead187b0399ba3 (diff) | |
download | rails-bc619fb05df516c404d42fb2a13d29b192a07a7e.tar.gz rails-bc619fb05df516c404d42fb2a13d29b192a07a7e.tar.bz2 rails-bc619fb05df516c404d42fb2a13d29b192a07a7e.zip |
Merge pull request #28017 from mtsmfm/suppress-dep-warn
Suppress deprecation warning `implementing to_yaml is deprecated`
3 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/type_metadata.rb b/activerecord/lib/active_record/connection_adapters/mysql/type_metadata.rb index 24dcf852e1..9ad6a6c0d0 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql/type_metadata.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql/type_metadata.rb @@ -2,6 +2,8 @@ module ActiveRecord module ConnectionAdapters module MySQL class TypeMetadata < DelegateClass(SqlTypeMetadata) # :nodoc: + undef to_yaml if method_defined?(:to_yaml) + attr_reader :extra def initialize(type_metadata, extra: "") diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/type_metadata.rb b/activerecord/lib/active_record/connection_adapters/postgresql/type_metadata.rb index 311988625f..f57179ae59 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/type_metadata.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/type_metadata.rb @@ -1,6 +1,8 @@ module ActiveRecord module ConnectionAdapters class PostgreSQLTypeMetadata < DelegateClass(SqlTypeMetadata) + undef to_yaml if method_defined?(:to_yaml) + attr_reader :oid, :fmod, :array def initialize(type_metadata, oid: nil, fmod: nil) diff --git a/activerecord/lib/active_record/type/serialized.rb b/activerecord/lib/active_record/type/serialized.rb index 6af05c1860..edbd20a6c1 100644 --- a/activerecord/lib/active_record/type/serialized.rb +++ b/activerecord/lib/active_record/type/serialized.rb @@ -1,6 +1,8 @@ module ActiveRecord module Type class Serialized < DelegateClass(ActiveModel::Type::Value) # :nodoc: + undef to_yaml if method_defined?(:to_yaml) + include ActiveModel::Type::Helpers::Mutable attr_reader :subtype, :coder |