aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-01-14 17:58:17 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2014-01-14 17:58:17 -0800
commit5e5118aa8ba821af6e615cfd2903b848ff8a9177 (patch)
tree2941195a16e690d92fdf1c487736a68a2b11dfdf /activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
parent438fce75af61e566cf63da9dbd5593e118a9e4c5 (diff)
downloadrails-5e5118aa8ba821af6e615cfd2903b848ff8a9177.tar.gz
rails-5e5118aa8ba821af6e615cfd2903b848ff8a9177.tar.bz2
rails-5e5118aa8ba821af6e615cfd2903b848ff8a9177.zip
fix exception translation
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_adapter.rb5
1 files changed, 3 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 bb9a9b1b58..a8a530e1d5 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -353,11 +353,12 @@ module ActiveRecord
protected
- def translate_exception(e, sql)
+ def translate_exception_class(e, sql)
message = "#{e.class.name}: #{e.message}: #{sql}"
@logger.error message if @logger
exception = translate_exception(e, message)
exception.set_backtrace e.backtrace
+ exception
end
def log(sql, name = "SQL", binds = [], statement_name = nil)
@@ -369,7 +370,7 @@ module ActiveRecord
:statement_name => statement_name,
:binds => binds) { yield }
rescue => e
- raise translate_exception(e, sql)
+ raise translate_exception_class(e, sql)
end
def translate_exception(exception, message)