Revert "Merge pull request rails#47352 from basecamp/ar-freeze-cached"

This reverts commit 2c20f90, reversing
changes made to 912096d.

Author: byroot

activemodel/lib/active_model/attribute.rb

@@ -115,17 +115,13 @@ def has_been_read?
     def ==(other)
       self.class == other.class &&
         name == other.name &&
-        identifier_value == other.identifier_value &&
+        value_before_type_cast == other.value_before_type_cast &&
         type == other.type
     end
     alias eql? ==
 
     def hash
-      [self.class, name, identifier_value, type].hash
-    end
-
-    def identifier_value
-      value_before_type_cast
+      [self.class, name, value_before_type_cast, type].hash
     end
 
     def init_with(coder)

activemodel/lib/active_model/type/helpers/mutable.rb

@@ -4,6 +4,10 @@ module ActiveModel
   module Type
     module Helpers # :nodoc: all
       module Mutable
+        def immutable_value(value)
+          value.deep_dup.freeze
+        end
+
         def cast(value)
           deserialize(serialize(value))
         end

activerecord/CHANGELOG.md

@@ -1,7 +1,3 @@
-*   Fix error when querying serialized Class attributes.
-
-    *Jorge Manrubia*
-
 *   Add support for `Array#intersect?` to `ActiveRecord::Relation`.
 
     `Array#intersect?` is only available on Ruby 3.1 or later.

activerecord/lib/active_record/relation/predicate_builder.rb

@@ -66,7 +66,7 @@ def build(attribute, value, operator = nil)
 
     def build_bind_attribute(column_name, value)
       type = table.type(column_name)
-      Relation::QueryAttribute.new(column_name, value, type)
+      Relation::QueryAttribute.new(column_name, type.immutable_value(value), type)
     end
 
     def resolve_arel_attribute(table_name, column_name, &block)

activerecord/lib/active_record/relation/query_attribute.rb

@@ -36,24 +36,10 @@ def unboundable?
         @_unboundable
       end
 
-      def identifier_value
-        if unboundable?
-          super
-        else
-          # Override to define equality based on frozen casted values to prevent caching
-          # issues with mutable database query values.
-          value_for_database
-        end
-      end
-
       private
         def infinity?(value)
           value.respond_to?(:infinite?) && value.infinite?
         end
-
-        def _value_for_database
-          super.deep_dup.freeze
-        end
     end
   end
 end

activerecord/test/cases/serialized_attribute_test.rb

@@ -9,11 +9,6 @@
 class SerializedAttributeTest < ActiveRecord::TestCase
   def setup
     ActiveRecord.use_yaml_unsafe_load = true
-    @yaml_column_permitted_classes_default = ActiveRecord.yaml_column_permitted_classes
-  end
-
-  def teardown
-    ActiveRecord.yaml_column_permitted_classes = @yaml_column_permitted_classes_default
   end
 
   fixtures :topics, :posts
@@ -28,10 +23,6 @@ class ImportantTopic < Topic
     serialize :important, type: Hash
   end
 
-  class ClassifiedTopic < Topic
-    serialize :important, type: Class
-  end
-
   teardown do
     Topic.serialize("content")
   end
@@ -175,14 +166,6 @@ def test_serialized_string_attribute
     assert_equal(myobj, topic.content)
   end
 
-  def test_serialized_class_attribute
-    ActiveRecord.yaml_column_permitted_classes += [Class]
-
-    topic = ClassifiedTopic.create(important: Symbol).reload
-    assert_equal(Symbol, topic.important)
-    assert_not_empty ClassifiedTopic.where(important: Symbol)
-  end
-
   def test_nil_serialized_attribute_without_class_constraint
     topic = Topic.new
     assert_nil topic.content
@@ -568,7 +551,6 @@ def test_serialized_attribute_works_under_concurrent_initial_access
 
 class SerializedAttributeTestWithYamlSafeLoad < SerializedAttributeTest
   def setup
-    super
     ActiveRecord.use_yaml_unsafe_load = false
   end