aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorMax Melentiev <printercu@gmail.com>2012-12-24 15:46:52 +0400
committerMax Melentiev <melentievm@gmail.com>2013-12-07 17:30:00 +0400
commitc46ff516a25684a2d04d453b2db44d6fa224c350 (patch)
tree8c03f9bcb1b0143de1cb1f59e48dc1f9e88a361b /activerecord/test
parent76dae289edf33d4b3fc937ecd9d2c77b294d8074 (diff)
downloadrails-c46ff516a25684a2d04d453b2db44d6fa224c350.tar.gz
rails-c46ff516a25684a2d04d453b2db44d6fa224c350.tar.bz2
rails-c46ff516a25684a2d04d453b2db44d6fa224c350.zip
fix for messages in invalid encoding from db-drivers
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/connection_adapters/abstract_adapter_test.rb9
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