Merge pull request rails#48039 from ghiculescu/ar-encryption-default-proc

Fix `Marshal.dump` on records that use AR Encryption

Author: byroot

activerecord/lib/active_record/encryption/encryptable_record.rb

@@ -84,7 +84,7 @@ def encrypt_attribute(name, attribute_scheme)
 
             attribute name do |cast_type|
               ActiveRecord::Encryption::EncryptedAttributeType.new(scheme: attribute_scheme, cast_type: cast_type,
-                                                                    default: -> { columns_hash[name.to_s]&.default })
+                                                                    default: columns_hash[name.to_s]&.default)
             end
 
             preserve_original_encrypted(name) if attribute_scheme.ignore_case?

activerecord/lib/active_record/encryption/encrypted_attribute_type.rb

@@ -76,9 +76,7 @@ def previous_type?
         def decrypt(value)
           with_context do
             unless value.nil?
-              default = @default.call if @default
-
-              if default && default == value
+              if @default && @default == value
                 value
               else
                 encryptor.decrypt(value, **decryption_options)

activerecord/test/cases/encryption/encryptable_record_test.rb

@@ -303,6 +303,11 @@ def name
     assert_equal "<untitled>", book.name
   end
 
+  test "can dump and load records that use encryption" do
+    book = EncryptedBook.create!
+    assert_equal book, Marshal.load(Marshal.dump(book))
+  end
+
   private
     class FailingKeyProvider
       def decryption_key(message) end