TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix exception translation

Browse Source
This commit is contained in:
Aaron Patterson 2014-01-14 17:58:17 -08:00
parent 9bc303cae2
commit 1543863548
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
View File

@ -349,11 +349,12 @@ def close
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)
@ -365,7 +366,7 @@ def log(sql, name = "SQL", binds = [], statement_name = nil)
: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)

2
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
View File

@ -856,7 +856,7 @@ def prepare_statement(sql)
begin
@connection.prepare nextkey, sql
rescue => e
raise translate_exception(e, sql)
raise translate_exception_class(e, sql)
end
# Clear the queue
@connection.get_last_result