diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-07-09 04:14:48 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-09 04:14:48 +0930 |
| commit | e5bcc7b53cb87643e8cdbf000fea0a03bfcd34f6 (patch) | |
| tree | 84809d2b8d6edc196037aae2dcdc57125b0c5f65 /activerecord/lib | |
| parent | 40a20ded015c92c875c8e96c1687c96303ced7f8 (diff) | |
| parent | 8219e177633e3c3a77a50c2342b8fe6c4956914b (diff) | |
| download | rails-e5bcc7b53cb87643e8cdbf000fea0a03bfcd34f6.tar.gz rails-e5bcc7b53cb87643e8cdbf000fea0a03bfcd34f6.tar.bz2 rails-e5bcc7b53cb87643e8cdbf000fea0a03bfcd34f6.zip | |
Merge pull request #29692 from fimmtiu/avoid-translating-non-database-exceptions
Don't translate non-database exceptions.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 6 |
1 files changed, 4 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 cfe1892d78..30b29e7007 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -576,12 +576,14 @@ module ActiveRecord type_casted_binds: type_casted_binds, statement_name: statement_name, connection_id: object_id) do + begin @lock.synchronize do yield end + rescue => e + raise translate_exception_class(e, sql) end - rescue => e - raise translate_exception_class(e, sql) + end end def translate_exception(exception, message) |