diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-28 17:01:01 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-29 02:04:24 -0200 |
| commit | d40309a0b8faaea766f8cf89b36d2323a1d35d88 (patch) | |
| tree | ad1c1db16b8afd8fcbd55ca89d7509206f8a2084 /activerecord/lib/active_record/connection_adapters | |
| parent | cdfa4a5f869b42fc3894e777d94b976ece28f716 (diff) | |
| download | rails-d40309a0b8faaea766f8cf89b36d2323a1d35d88.tar.gz rails-d40309a0b8faaea766f8cf89b36d2323a1d35d88.tar.bz2 rails-d40309a0b8faaea766f8cf89b36d2323a1d35d88.zip | |
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
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |