diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-12-03 10:47:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-03 10:47:50 -0500 |
| commit | e167818687bd71b6358f4c84e782009952662e80 (patch) | |
| tree | 1a250415fa954ac1870b247a6f677a0432f4f97d /activerecord | |
| parent | 41e468a0518a45d017bfe74b4be12afd1d07e04c (diff) | |
| parent | 6d1c9a9b23579d13b7cbdd3217ed2cfcc300e06e (diff) | |
| download | rails-e167818687bd71b6358f4c84e782009952662e80.tar.gz rails-e167818687bd71b6358f4c84e782009952662e80.tar.bz2 rails-e167818687bd71b6358f4c84e782009952662e80.zip | |
Merge pull request #34602 from guizmaii/master
Pass the `connection` to the `@instrumenter.instrument` method call
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 9d971d9e16..f7d75e6748 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -629,7 +629,8 @@ module ActiveRecord binds: binds, type_casted_binds: type_casted_binds, statement_name: statement_name, - connection_id: object_id) do + connection_id: object_id, + connection: self) do begin @lock.synchronize do yield |