Switch back to DelegateClass(ActiveModel::Type::Value)

Thanks to @rafaelfranca for the suggestion.
djmb · Aug 22, 2024 · 3fb30db · 3fb30db
1 parent b234a94
commit 3fb30db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/activerecord/lib/active_record/encryption/encryptable_record.rb b/activerecord/lib/active_record/encryption/encryptable_record.rb
@@ -88,14 +88,15 @@ def encrypt_attribute(name, key_provider: nil, key: nil, deterministic: false, s
               scheme = scheme_for key_provider: key_provider, key: key, deterministic: deterministic, support_unencrypted_data: support_unencrypted_data, \
                 downcase: downcase, ignore_case: ignore_case, previous: previous, compress: compress, compressor: compressor, **context_properties
 
+              type_options = { scheme: scheme, default: columns_hash[name.to_s]&.default }
               if cast_type.serialized?
                 cast_type.tap do |serialized_type|
                   serialized_type.replace_serialized_subtype do |current_subtype|
-                    ActiveRecord::Encryption::EncryptedAttributeType.new(scheme: scheme, cast_type: current_subtype, default: columns_hash[name.to_s]&.default)
+                    ActiveRecord::Encryption::EncryptedAttributeType.new(cast_type: current_subtype, **type_options)
                   end
                 end
               else
-                ActiveRecord::Encryption::EncryptedAttributeType.new(scheme: scheme, cast_type: cast_type, default: columns_hash[name.to_s]&.default)
+                ActiveRecord::Encryption::EncryptedAttributeType.new(cast_type: cast_type, **type_options)
               end
             end
 

diff --git a/activerecord/lib/active_record/type/serialized.rb b/activerecord/lib/active_record/type/serialized.rb
@@ -2,7 +2,7 @@
 
 module ActiveRecord
   module Type
-    class Serialized < SimpleDelegator # :nodoc:
+    class Serialized < DelegateClass(ActiveModel::Type::Value) # :nodoc:
       undef to_yaml if method_defined?(:to_yaml)
 
       include ActiveModel::Type::Helpers::Mutable
@@ -12,7 +12,7 @@ class Serialized < SimpleDelegator # :nodoc:
       def initialize(subtype, coder)
         @subtype = subtype
         @coder = coder
-        __setobj__(subtype)
+        super(subtype)
       end
 
       def init_with(coder) # :nodoc:
@@ -67,6 +67,7 @@ def serialized? # :nodoc:
       def replace_serialized_subtype(&block) # :nodoc:
         @subtype = block.call(subtype)
         __setobj__(@subtype)
+        self
       end
 
       private