Merge pull request #27076 from y-yagi/fix_postgresql_array_encoding

use `force_encoding` instread of `encode!` to avoid `UndefinedConversionError`

2 files changed, 4 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb
index b969503178..d9daaaa23e 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/array.rb
@@ -35,7 +35,7 @@ module ActiveRecord
             if value.is_a?(::Array)
               result = @pg_encoder.encode(type_cast_array(value, :serialize))
               if encoding = determine_encoding_of_strings(value)
-                result.encode!(encoding)
+                result.force_encoding(encoding)
               end
               result
             else
diff --git a/activerecord/test/cases/adapters/postgresql/array_test.rb b/activerecord/test/cases/adapters/postgresql/array_test.rb
index d741ca4389..680dad9706 100644
--- a/activerecord/test/cases/adapters/postgresql/array_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/array_test.rb
@@ -312,9 +312,9 @@ class PostgresqlArrayTest < ActiveRecord::PostgreSQLTestCase
   end
 
   def test_encoding_arrays_of_utf8_strings
-    string_with_utf8 = "nový"
-    assert_equal [string_with_utf8], @type.deserialize(@type.serialize([string_with_utf8]))
-    assert_equal [[string_with_utf8]], @type.deserialize(@type.serialize([[string_with_utf8]]))
+    arrays_of_utf8_strings = %w(nový ファイル)
+    assert_equal arrays_of_utf8_strings, @type.deserialize(@type.serialize(arrays_of_utf8_strings))
+    assert_equal [arrays_of_utf8_strings], @type.deserialize(@type.serialize([arrays_of_utf8_strings]))
   end
 
   private