Merge pull request #8057 from frodsan/fix_sqlite_mutate_arg

SQLite3Adapter#type_cast should not mutate arguments

2 files changed, 7 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index c5a859475f..b89e9a01a8 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -251,7 +251,7 @@ module ActiveRecord
         value = super
         if column.type == :string && value.encoding == Encoding::ASCII_8BIT
           logger.error "Binary data inserted for `string` type on column `#{column.name}`" if logger
-          value.encode! 'utf-8'
+          value = value.encode Encoding::UTF_8
         end
         value
       end
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index 4e26c5dda1..559fb2435c 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -154,6 +154,12 @@ module ActiveRecord
         DualEncoding.connection.drop_table('dual_encodings')
       end
 
+      def test_type_cast_should_not_mutate_encoding
+        name  = 'hello'.force_encoding(Encoding::ASCII_8BIT)
+        owner = Owner.create(name: name)
+        assert_equal Encoding::ASCII_8BIT, name.encoding
+      end
+
       def test_execute
         @conn.execute "INSERT INTO items (number) VALUES (10)"
         records = @conn.execute "SELECT * FROM items"