diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 5929a6f1758103a284fdc382318da07a46d672e1..54700a5d68f1a71a7b307a00dfbcedd32622f633 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,7 +1,3 @@ -* Deprecate YAML loading from legacy format older than Rails 5.0. - - *Ryuta Kamizono* - * Added the setting `ActiveRecord::Base.immutable_strings_by_default`, which allows you to specify that all string columns should be frozen unless otherwise specified. This will reduce memory pressure for applications which diff --git a/activerecord/lib/active_record/legacy_yaml_adapter.rb b/activerecord/lib/active_record/legacy_yaml_adapter.rb index 252d608ea014f32e0d68714bbcadc2700c1aa363..ffa095dd9478c234dfdaead365813205608ed8a7 100644 --- a/activerecord/lib/active_record/legacy_yaml_adapter.rb +++ b/activerecord/lib/active_record/legacy_yaml_adapter.rb @@ -1,17 +1,13 @@ # frozen_string_literal: true module ActiveRecord - module LegacyYamlAdapter # :nodoc: + module LegacyYamlAdapter def self.convert(klass, coder) return coder unless coder.is_a?(Psych::Coder) case coder["active_record_yaml_version"] when 1, 2 then coder else - ActiveSupport::Deprecation.warn(<<-MSG.squish) - YAML loading from legacy format older than Rails 5.0 is deprecated - and will be removed in Rails 6.2. - MSG if coder["attributes"].is_a?(ActiveModel::AttributeSet) Rails420.convert(klass, coder) else @@ -20,7 +16,7 @@ def self.convert(klass, coder) end end - module Rails420 # :nodoc: + module Rails420 def self.convert(klass, coder) attribute_set = coder["attributes"] @@ -36,7 +32,7 @@ def self.convert(klass, coder) end end - module Rails41 # :nodoc: + module Rails41 def self.convert(klass, coder) attributes = klass.attributes_builder .build_from_database(coder["attributes"]) diff --git a/activerecord/test/cases/yaml_serialization_test.rb b/activerecord/test/cases/yaml_serialization_test.rb index 9cdeb55e1303c8605934e5c4b766d385b9f73cc4..f834218491c5a0c89e59aeff663755a267d977df 100644 --- a/activerecord/test/cases/yaml_serialization_test.rb +++ b/activerecord/test/cases/yaml_serialization_test.rb @@ -94,9 +94,7 @@ def test_a_yaml_version_is_provided_for_future_backwards_compat end def test_deserializing_rails_41_yaml - topic = assert_deprecated do - YAML.load(yaml_fixture("rails_4_1")) - end + topic = YAML.load(yaml_fixture("rails_4_1")) assert_predicate topic, :new_record? assert_nil topic.id @@ -105,9 +103,7 @@ def test_deserializing_rails_41_yaml end def test_deserializing_rails_4_2_0_yaml - topic = assert_deprecated do - YAML.load(yaml_fixture("rails_4_2_0")) - end + topic = YAML.load(yaml_fixture("rails_4_2_0")) assert_not_predicate topic, :new_record? assert_equal 1, topic.id