Merge pull request #10200 from calebthompson/ct-fix-freeze-freezing-cloned-models

Fix freeze applying to cloned objects

activerecord/lib/active_record/core.rb

@@ -307,9 +307,11 @@ def hash
       id.hash
     end
 
-    # Freeze the attributes hash such that associations are still accessible, even on destroyed records.
+    # Clone and freeze the attributes hash such that associations are still
+    # accessible, even on destroyed records, but cloned models will not be
+    # frozen.
     def freeze
-      @attributes.freeze
+      @attributes = @attributes.clone.freeze
       self
     end
 

activerecord/test/cases/clone_test.rb

@@ -29,5 +29,12 @@ def test_shallow
       topic.author_name = 'Aaron'
       assert_equal 'Aaron', cloned.author_name
     end
+
+    def test_freezing_a_cloned_model_does_not_freeze_clone
+      cloned = Topic.new
+      clone = cloned.clone
+      cloned.freeze
+      assert_not clone.frozen?
+    end
   end
 end