From d40309a0b8faaea766f8cf89b36d2323a1d35d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sun, 28 Oct 2012 17:01:01 -0700
Subject: Merge pull request #8057 from frodsan/fix_sqlite_mutate_arg

SQLite3Adapter#type_cast should not mutate arguments
Conflicts:
	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
---
 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 731f7e2049..e80b465bab 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -205,7 +205,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
-- 
cgit v1.2.3