Merge pull request #15674 from sgrif/sg-mutable-attributes

Detect in-place changes on mutable AR attributes

2 files changed, 4 insertions, 8 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/hstore.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/hstore.rb
index 88de816d4f..0dd4b65333 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/hstore.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/hstore.rb
@@ -3,14 +3,12 @@ module ActiveRecord
     module PostgreSQL
       module OID # :nodoc:
         class Hstore < Type::Value
+          include Type::Mutable
+
           def type
             :hstore
           end
 
-          def type_cast_from_user(value)
-            type_cast_from_database(type_cast_for_database(value))
-          end
-
           def type_cast_from_database(value)
             ConnectionAdapters::PostgreSQLColumn.string_to_hstore(value)
           end
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb
index b4fed1bcab..d1347c7bb5 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/json.rb
@@ -3,14 +3,12 @@ module ActiveRecord
     module PostgreSQL
       module OID # :nodoc:
         class Json < Type::Value
+          include Type::Mutable
+
           def type
             :json
           end
 
-          def type_cast_from_user(value)
-            type_cast_from_database(type_cast_for_database(value))
-          end
-
           def type_cast_from_database(value)
             ConnectionAdapters::PostgreSQLColumn.string_to_json(value)
           end