aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-03-02 10:25:00 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-03-02 10:28:06 -0800
commitaf022918716e894608d655cdb52ec3164fee597a (patch)
tree225100571841387ba06e8ec0caa9ff908dab7864 /activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
parent867482335067bcef7faae91a7eaa9e98bf94ac62 (diff)
downloadrails-af022918716e894608d655cdb52ec3164fee597a.tar.gz
rails-af022918716e894608d655cdb52ec3164fee597a.tar.bz2
rails-af022918716e894608d655cdb52ec3164fee597a.zip
only log an error if there is a logger. fixes #5226
Conflicts: activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb2
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 ad0d0d7170..55bffc6518 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -204,7 +204,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}`"
+ logger.error "Binary data inserted for `string` type on column `#{column.name}`" if logger
value.encode! 'utf-8'
end
value