1 files changed, 9 insertions, 0 deletions
diff --git a/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb b/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
index eb2fe5639b..d6fd39cb09 100644
--- a/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
+++ b/activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require "cases/helper"
 
 module ActiveRecord
@@ -57,6 +58,14 @@ module ActiveRecord
 
         assert_equal adapter, pool.connection
       end
+
+      def test_log_invalid_encoding
+        assert_raise ActiveRecord::StatementInvalid do
+          adapter.send :log, "SELECT 'ы' FROM DUAL" do
+            raise 'ы'.force_encoding(Encoding::ASCII_8BIT)
+          end
+        end
+      end
     end
   end
 end