diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-11-10 14:18:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-10 14:18:40 -0500 |
| commit | cac3be6341f95c9a347d62173a4a130d1e42141b (patch) | |
| tree | 0e24a0271cbe5ab2e50615685cb8c51093705a50 /activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | |
| parent | c58083584c3a7a2e29f609760547e10e46d56a33 (diff) | |
| parent | 3c785bdceed4bdf67708197aa687ced6728d77f3 (diff) | |
| download | rails-cac3be6341f95c9a347d62173a4a130d1e42141b.tar.gz rails-cac3be6341f95c9a347d62173a4a130d1e42141b.tar.bz2 rails-cac3be6341f95c9a347d62173a4a130d1e42141b.zip | |
Merge pull request #26978 from matthewd/query-cache-pool
Configure query caching (per thread) on the connection pool
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb index 9727d63883..5d8546916e 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -307,6 +307,7 @@ module ActiveRecord end include MonitorMixin + include QueryCache::ConnectionPoolConfiguration attr_accessor :automatic_reconnect, :checkout_timeout, :schema_cache attr_reader :spec, :connections, :size, :reaper |