From c46ff516a25684a2d04d453b2db44d6fa224c350 Mon Sep 17 00:00:00 2001 From: Max Melentiev Date: Mon, 24 Dec 2012 15:46:52 +0400 Subject: fix for messages in invalid encoding from db-drivers --- .../lib/active_record/connection_adapters/abstract_adapter.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 8aa1ce5c04..e3ff0fb2c5 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -358,7 +358,11 @@ module ActiveRecord :statement_name => statement_name, :binds => binds) { yield } rescue => e - message = "#{e.class.name}: #{e.message}: #{sql}" + begin + message = "#{e.class.name}: #{e.message}: #{sql}" + rescue Encoding::CompatibilityError + message = "#{e.class.name}: #{e.message.force_encoding sql.encoding}: #{sql}" + end @logger.error message if @logger exception = translate_exception(e, message) exception.set_backtrace e.backtrace -- cgit v1.2.3