From b5c939dcb3979901fc31f8c79a4fde58999052e8 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 2 Mar 2012 10:25:00 -0800
Subject: only log an error if there is a logger. fixes #5226

---
 .../lib/active_record/connection_adapters/abstract_adapter.rb    | 2 +-
 .../lib/active_record/connection_adapters/sqlite_adapter.rb      | 2 +-
 activerecord/test/cases/adapters/sqlite3/quoting_test.rb         | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index c6af682d28..594649189d 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -57,7 +57,7 @@ module ActiveRecord
       define_callbacks :checkout, :checkin
 
       attr_accessor :visitor, :pool
-      attr_reader :schema_cache, :last_use, :in_use
+      attr_reader :schema_cache, :last_use, :in_use, :logger
       alias :in_use? :in_use
 
       def initialize(connection, logger = nil, pool = nil) #:nodoc:
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index c85c4c6e51..3d8dfab05c 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -202,7 +202,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
diff --git a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
index 46da1b0a2b..1dbeb66af6 100644
--- a/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/quoting_test.rb
@@ -1,6 +1,7 @@
 require "cases/helper"
 require 'bigdecimal'
 require 'yaml'
+require 'securerandom'
 
 module ActiveRecord
   module ConnectionAdapters
@@ -12,6 +13,14 @@ module ActiveRecord
             :timeout => 100
         end
 
+        def test_type_cast_binary_encoding_without_logger
+          @conn.extend(Module.new { def logger; end })
+          column = Struct.new(:type, :name).new(:string, "foo")
+          binary = SecureRandom.hex
+          expected = binary.dup.encode!('utf-8')
+          assert_equal expected, @conn.type_cast(binary, column)
+        end
+
         def test_type_cast_symbol
           assert_equal 'foo', @conn.type_cast(:foo, nil)
         end
-- 
cgit v1.2.3