makara 0.4.1 → 0.5.1

data/CHANGELOG.md

@@ -1,109 +1,130 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Unreleased
+
+### v0.5.1 - 2021-06-04
+[Full Changelog](https://github.com/instacart/makara/compare/v0.5.0...v0.6.0.pre)
+- Use ActiveRecord URL resolver instead of copying definition [#294](https://github.com/instacart/makara/pull/294) Matt Larraz
+- Fix Ruby 2.7 kwarg warning and add Ruby 3 support [#283](https://github.com/instacart/makara/pull/283) Matt Larraz
+- Drop support for Ruby < 2.5 and ActiveRecord < 5.2 [#281](https://github.com/instacart/makara/pull/281) Matt Larraz
+
+## v0.5.0 - 2021-01-08
+[Full Changelog](https://github.com/instacart/makara/compare/v0.4.1...v0.4.2)
+- Replace deprecated URI.unescape with CGI.unescape [#252](https://github.com/instacart/makara/pull/252) Kevin Robatel
+- Override equality operator for ActiveRecord connection wrapper [#269](https://github.com/instacart/makara/pull/269) Praveen Burgu
+- Handle blacklisted connections in master pool while in transaction [#267](https://github.com/instacart/makara/pull/267) Praveen Burgu
+- Handle ActiveRecord connection pools correctly [#267](https://github.com/instacart/makara/pull/267) Praveen Burgu
+- Add preliminary support for sharded databases [#267](https://github.com/instacart/makara/pull/267) Praveen Burgu
+- Fix ActiveRecord connection pool exhaustion [#268](https://github.com/instacart/makara/pull/268) Praveen Burgu
+- Drop support for Ruby 2.0, 2.1 and 2.2 [#267](https://github.com/instacart/makara/pull/267) Praveen Burgu
+- Drop support ActiveRecord 3.x and 4.x [#267](https://github.com/instacart/makara/pull/267) Praveen Burgu
+- Set up automatic publishing to Github and Rubygems [#275](https://github.com/instacart/makara/pull/275) Matt Larraz
+
+
 ## v0.4.1 - 2019-03-25
-[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.4.0...v0.4.1)
+[Full Changelog](https://github.com/instacart/makara/compare/v0.4.0...v0.4.1)
 
-- Fix crash by requiring makara in the adapter [#54](https://github.com/taskrabbit/makara/pull/54) Eric Saxby
-- Add connection logging in non-Rails enviroments [#223](https://github.com/taskrabbit/makara/pull/223) Andrew Kane
+- Fix crash by requiring makara in the adapter [#54](https://github.com/instacart/makara/pull/54) Eric Saxby
+- Add connection logging in non-Rails enviroments [#223](https://github.com/instacart/makara/pull/223) Andrew Kane
 
 ## v0.4.0 - 2018-04-01
-[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.10...v0.4.0)
+[Full Changelog](https://github.com/instacart/makara/compare/v0.3.10...v0.4.0)
 
 This release is a major change to how we remember state between requests. A redis store is no longer needed. Everything is in the cookies.
- - Implement stickiness for the duration of `master_ttl` via cookies [#194](https://github.com/taskrabbit/makara/pull/194) Rosa Gutierrez
+ - Implement stickiness for the duration of `master_ttl` via cookies [#194](https://github.com/instacart/makara/pull/194) Rosa Gutierrez
 
 
 ## v0.3.10 - 2018-03-20
-[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.9...v0.3.10)
+[Full Changelog](https://github.com/instacart/makara/compare/v0.3.9...v0.3.10)
 
 Fixed
-- Send nextval queries to master and show queries to replicas for Postgres [#173](https://github.com/taskrabbit/makara/pull/173) Andrew Kane
-- Fixes can't add a new key into hash during iteration error [#174](https://github.com/taskrabbit/makara/pull/174) Andrew Kane
-- Fix: an application freezes when a slave is down [#180](https://github.com/taskrabbit/makara/pull/180) Alexey P
-- Allow SELECTs that use common table expressions to go to replicas [#184](https://github.com/taskrabbit/makara/pull/184) Andrew Kane
-- Send advisory lock requests to the master [#198](https://github.com/taskrabbit/makara/pull/198) George Claghorn
-- Postgres exists query [#199](https://github.com/taskrabbit/makara/pull/199) Brian Leonard
+- Send nextval queries to master and show queries to replicas for Postgres [#173](https://github.com/instacart/makara/pull/173) Andrew Kane
+- Fixes can't add a new key into hash during iteration error [#174](https://github.com/instacart/makara/pull/174) Andrew Kane
+- Fix: an application freezes when a slave is down [#180](https://github.com/instacart/makara/pull/180) Alexey P
+- Allow SELECTs that use common table expressions to go to replicas [#184](https://github.com/instacart/makara/pull/184) Andrew Kane
+- Send advisory lock requests to the master [#198](https://github.com/instacart/makara/pull/198) George Claghorn
+- Postgres exists query [#199](https://github.com/instacart/makara/pull/199) Brian Leonard
 
 Documentation and Test
-- Clarify README's "What goes where" [#187](https://github.com/taskrabbit/makara/pull/187) Jan Sandbrink
-- Fix loading fixtures in Rails 5.2 [#192](https://github.com/taskrabbit/makara/pull/192) George Claghorn
-- Travis Upgrade [#199](https://github.com/taskrabbit/makara/pull/199) Brian Leonard
+- Clarify README's "What goes where" [#187](https://github.com/instacart/makara/pull/187) Jan Sandbrink
+- Fix loading fixtures in Rails 5.2 [#192](https://github.com/instacart/makara/pull/192) George Claghorn
+- Travis Upgrade [#199](https://github.com/instacart/makara/pull/199) Brian Leonard
 
 ## v0.3.9 - 2017-08-14
-[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.8...v0.3.9)
+[Full Changelog](https://github.com/instacart/makara/compare/v0.3.8...v0.3.9)
 
 Changed
-- Add postgis support [#118](https://github.com/taskrabbit/makara/pull/118) Kevin Bacha
+- Add postgis support [#118](https://github.com/instacart/makara/pull/118) Kevin Bacha
 
 ## v0.3.8 - 2017-07-11
 
-[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.7...v0.3.8)
+[Full Changelog](https://github.com/instacart/makara/compare/v0.3.7...v0.3.8)
 
 Changed
-- Rails 5.1 compatibility [#150](https://github.com/taskrabbit/makara/pull/150) Jeremy Daer
-- Minimize redundant context cache requests [#157](https://github.com/taskrabbit/makara/issues/157) Greg Patrick
-- thread-local cache for previous context stickiness [#158](https://github.com/taskrabbit/makara/issues/158)  Jeremy Daer
-- Configurable cookie options [#159](https://github.com/taskrabbit/makara/pull/159) Jeremy Daer
-- Test against Rails 5.x and Ruby 2.x [#160](https://github.com/taskrabbit/makara/pull/160) Jeremy Daer
+- Rails 5.1 compatibility [#150](https://github.com/instacart/makara/pull/150) Jeremy Daer
+- Minimize redundant context cache requests [#157](https://github.com/instacart/makara/issues/157) Greg Patrick
+- thread-local cache for previous context stickiness [#158](https://github.com/instacart/makara/issues/158)  Jeremy Daer
+- Configurable cookie options [#159](https://github.com/instacart/makara/pull/159) Jeremy Daer
+- Test against Rails 5.x and Ruby 2.x [#160](https://github.com/instacart/makara/pull/160) Jeremy Daer
 
 ## v0.3.7 - 2016-09-22
 
-[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.6...v0.3.7)
+[Full Changelog](https://github.com/instacart/makara/compare/v0.3.6...v0.3.7)
 
 Changed
 
-- Fix the hierarchy of the config file [#116](https://github.com/taskrabbit/makara/pull/116) Kevin Bacha
-- "Disable blacklist" parameter [#134](https://github.com/taskrabbit/makara/pull/134) Alex Tonkonozhenko
-- Fixes bug in `without_sticking` [#96](https://github.com/taskrabbit/makara/pull/96) Brian Leonard
-- Always stick inside transactions [#96](https://github.com/taskrabbit/makara/pull/96) Brian Leonard
-- Rails 5 support [#122](https://github.com/taskrabbit/makara/pull/122) Jonny McAllister
+- Fix the hierarchy of the config file [#116](https://github.com/instacart/makara/pull/116) Kevin Bacha
+- "Disable blacklist" parameter [#134](https://github.com/instacart/makara/pull/134) Alex Tonkonozhenko
+- Fixes bug in `without_sticking` [#96](https://github.com/instacart/makara/pull/96) Brian Leonard
+- Always stick inside transactions [#96](https://github.com/instacart/makara/pull/96) Brian Leonard
+- Rails 5 support [#122](https://github.com/instacart/makara/pull/122) Jonny McAllister
 
 ## v0.3.6 - 2016-04-21
 
-[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.5...v0.3.6)
+[Full Changelog](https://github.com/instacart/makara/compare/v0.3.5...v0.3.6)
 
 Changed
 
-- Allow different strategies such as `priority` and `round_robin` for pools [#105](https://github.com/taskrabbit/makara/pull/105) Brian Leonard
+- Allow different strategies such as `priority` and `round_robin` for pools [#105](https://github.com/instacart/makara/pull/105) Brian Leonard
 
 
 ## v0.3.5 - 2016-01-08
 
-[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.4.rc1...v0.3.5)
+[Full Changelog](https://github.com/instacart/makara/compare/v0.3.4.rc1...v0.3.5)
 
 Changed
 
-- Raise `Makara::Errors::AllConnectionsBlacklisted` on timeout. [#104](https://github.com/taskrabbit/makara/pull/104) Brian Leonard
+- Raise `Makara::Errors::AllConnectionsBlacklisted` on timeout. [#104](https://github.com/instacart/makara/pull/104) Brian Leonard
 
 ## v0.3.4.rc1 - 2016-01-06
 
-[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.3...v0.3.4.rc1)
+[Full Changelog](https://github.com/instacart/makara/compare/v0.3.3...v0.3.4.rc1)
 
 Added
 
-- Add `url` to database connections configurations. [#93](https://github.com/taskrabbit/makara/pull/93) Benjamin Fleischer
+- Add `url` to database connections configurations. [#93](https://github.com/instacart/makara/pull/93) Benjamin Fleischer
 
 Changed
 
-- Improve Postgresql compatibility and failover support, also fix [#78](https://github.com/taskrabbit/makara/issues/78), [#79](https://github.com/taskrabbit/makara/issues/79). [#87](https://github.com/taskrabbit/makara/pull/87) Vlad
-- Update README: Specify newrelic_rpm gem versions that will have the performance issue. [#95](https://github.com/taskrabbit/makara/pull/95) Benjamin Fleischer
+- Improve Postgresql compatibility and failover support, also fix [#78](https://github.com/instacart/makara/issues/78), [#79](https://github.com/instacart/makara/issues/79). [#87](https://github.com/instacart/makara/pull/87) Vlad
+- Update README: Specify newrelic_rpm gem versions that will have the performance issue. [#95](https://github.com/instacart/makara/pull/95) Benjamin Fleischer
 
 ## v0.3.3 - 2015-05-20
 
-[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.2...v0.3.3)
+[Full Changelog](https://github.com/instacart/makara/compare/v0.3.2...v0.3.3)
 
 Changed
 
-- A context is local to the curent thread of execution. This will allow you to stick to master safely in a single thread in systems such as sidekiq, for instance. Fix [#83](https://github.com/taskrabbit/makara/issues/83). [#84](https://github.com/taskrabbit/makara/pull/84) Matt Camuto
+- A context is local to the curent thread of execution. This will allow you to stick to master safely in a single thread in systems such as sidekiq, for instance. Fix [#83](https://github.com/instacart/makara/issues/83). [#84](https://github.com/instacart/makara/pull/84) Matt Camuto
 
 ## v0.3.2 - 2015-05-16
 
-[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.1...v0.3.2)
+[Full Changelog](https://github.com/instacart/makara/compare/v0.3.1...v0.3.2)
 
 Fixed
 
-- Fix a `ArgumentError: not delegated` error for rails 3. [#82](https://github.com/taskrabbit/makara/pull/82) Eric Saxby
+- Fix a `ArgumentError: not delegated` error for rails 3. [#82](https://github.com/instacart/makara/pull/82) Eric Saxby
 
 Changed
 
@@ -111,7 +132,7 @@ Changed
 
 ## v0.3.1 - 2015-05-08
 
-[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.0...v0.3.1)
+[Full Changelog](https://github.com/instacart/makara/compare/v0.3.0...v0.3.1)
 
 Changed
 
@@ -121,21 +142,21 @@ Changed
 
 ## v0.3.0 - 2015-04-27
 
-[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.0.rc3...v0.3.0)
+[Full Changelog](https://github.com/instacart/makara/compare/v0.3.0.rc3...v0.3.0)
 
 Changed
 
-- Reduce logging noise by using [the same rules as ActiveRecord uses](https://github.com/rails/rails/blob/b06f64c3480cd389d14618540d62da4978918af0/activerecord/lib/active_record/log_subscriber.rb#L33). [#76](https://github.com/taskrabbit/makara/pull/76) Andrew Kane
+- Reduce logging noise by using [the same rules as ActiveRecord uses](https://github.com/rails/rails/blob/b06f64c3480cd389d14618540d62da4978918af0/activerecord/lib/active_record/log_subscriber.rb#L33). [#76](https://github.com/instacart/makara/pull/76) Andrew Kane
 
 Fixed
 
-- Fix an issue for postgres that would route all queries to master. [#72](https://github.com/taskrabbit/makara/pull/72) Kali Donovan
-- Fix an edge case which would cause SET operations to send to all connections([#70](https://github.com/taskrabbit/makara/issues/70)). [#80](https://github.com/taskrabbit/makara/pull/80) Michael Amor Righi
-- Fix performance regression with certain verions of [newrelic/rpm](https://github.com/newrelic/rpm)([#59](https://github.com/taskrabbit/makara/issues/59)). [#75](https://github.com/taskrabbit/makara/pull/75) Mike Nelson
+- Fix an issue for postgres that would route all queries to master. [#72](https://github.com/instacart/makara/pull/72) Kali Donovan
+- Fix an edge case which would cause SET operations to send to all connections([#70](https://github.com/instacart/makara/issues/70)). [#80](https://github.com/instacart/makara/pull/80) Michael Amor Righi
+- Fix performance regression with certain verions of [newrelic/rpm](https://github.com/newrelic/rpm)([#59](https://github.com/instacart/makara/issues/59)). [#75](https://github.com/instacart/makara/pull/75) Mike Nelson
 
 ## 0.3.0.rc3 - 2014-09-02[YANKED]
 
-[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.0.rc2...v0.3.0.rc3)
+[Full Changelog](https://github.com/instacart/makara/compare/v0.3.0.rc2...v0.3.0.rc3)
 
 Added
 - Allow bypassing of stickiness

data/Gemfile

@@ -1,19 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in makara.gemspec
 gemspec
-
-gem 'rake'
-gem 'rspec'
-gem 'timecop'
-gem 'byebug', :platform => :ruby
-gem 'ruby-debug', :platform => :jruby
-gem 'rack', '1.6.0'
-
-gem 'mysql2', :platform => :ruby
-gem 'pg', '0.21.0', :platform => :ruby
-gem 'activerecord-postgis-adapter', :platform => :ruby
-gem 'rgeo', :platform => :ruby
-
-gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
-gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby

data/README.md

@@ -1,19 +1,12 @@
 # Makara
 
-[![Build Status](https://travis-ci.org/taskrabbit/makara.png?branch=master)](https://travis-ci.org/taskrabbit/makara)
+![Build Status](https://github.com/instacart/makara/workflows/CI/badge.svg)
+[![Gem Version](https://badge.fury.io/rb/makara.svg)](https://badge.fury.io/rb/makara)
 [![Code Climate](https://codeclimate.com/repos/526886a7f3ea00679b00cae6/badges/7905f7a000492a1078f7/gpa.png)](https://codeclimate.com/repos/526886a7f3ea00679b00cae6/feed)
 
 
 Makara is generic master/slave proxy. It handles the heavy lifting of managing, choosing, blacklisting, and cycling through connections. It comes with an ActiveRecord database adapter implementation.
 
-#### Warning:
-
-There is a potential performance issue when used alongside certain versions of
-[newrelic/rpm](https://github.com/newrelic/rpm), [Issue #59](https://github.com/taskrabbit/makara/issues/59).
-
-> Any newrelic_rpm `< 3.11.2` and `>= 3.7.2` will have the regression.
-> I'd recommend upgrading newrelic_rpm to avoid the problem.
-
 ## Installation
 
 Use the current version of the gem from [rubygems](https://rubygems.org/gems/makara) in your `Gemfile`.
@@ -67,6 +60,12 @@ Makara handles stickiness by keeping track of which proxies are stuck at any giv
 
 To handle persistence of context across requests in a Rack app, makara provides a middleware. It lays a cookie named `_mkra_stck` which contains the current context. If the next request is executed before the cookie expires, that given context will be used. If something occurs which naturally requires master on the second request, the context is updated and stored again.
 
+#### Stickiness Impact
+
+When `sticky:true`, once a query as been sent to master, all queries for the rest of the request will also be sent to master.  In addition, the cookie described above will be set client side with an expiration defined by time at end of original request + `master_ttl`.  As long as the cookie is valid, all requests will send queries to master.
+
+When `sticky:false`, only queries that need to go to master will go there.  Subsequent read queries in the same request will go to slaves.
+
 #### Releasing stuck connections (clearing context)
 
 If you need to clear the current context, releasing any stuck connections, all you have to do is:

data/Rakefile

@@ -6,4 +6,4 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
 end
-task :default  => :spec
+task default: :spec

data/gemfiles/activerecord_5.2.gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+# Specify your gem"s dependencies in makara.gemspec
+gemspec path: "../"
+
+gem "activerecord", "~> 5.2.0"
+
+# gem "mysql2", "~> 0.4.10", platform: :ruby

data/gemfiles/activerecord_6.0.gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+# Specify your gem"s dependencies in makara.gemspec
+gemspec path: "../"
+
+gem "activerecord", "~> 6.0.0"
+
+# gem "mysql2", "~> 0.4.10", platform: :ruby

data/gemfiles/activerecord_6.1.gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+# Specify your gem"s dependencies in makara.gemspec
+gemspec path: "../"
+
+gem "activerecord", "~> 6.1.0"
+
+# gem "mysql2", "~> 0.4.10", platform: :ruby

data/gemfiles/activerecord_head.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+# Specify your gem"s dependencies in makara.gemspec
+gemspec path: "../"
+
+gem "activerecord", github: "rails/rails", branch: "main"

data/lib/active_record/connection_adapters/jdbcmysql_makara_adapter.rb

@@ -2,24 +2,10 @@ require 'active_record/connection_adapters/makara_abstract_adapter'
 require 'active_record/connection_adapters/jdbcmysql_adapter'
 require 'active_record/connection_adapters/mysql2_makara_adapter'
 
-if ActiveRecord::VERSION::MAJOR >= 4
-
-  module ActiveRecord
-    module ConnectionHandling
-      def jdbcmysql_makara_connection(config)
-        mysql2_makara_connection(config)
-      end
-    end
-  end
-
-else
-
-  module ActiveRecord
-    class Base
-      def self.jdbcmysql_makara_connection(config)
-        self.mysql2_makara_connection(config)
-      end
+module ActiveRecord
+  module ConnectionHandling
+    def jdbcmysql_makara_connection(config)
+      mysql2_makara_connection(config)
     end
   end
-
 end

data/lib/active_record/connection_adapters/jdbcpostgresql_makara_adapter.rb

@@ -2,24 +2,10 @@ require 'active_record/connection_adapters/makara_abstract_adapter'
 require 'active_record/connection_adapters/jdbcpostgresql_adapter'
 require 'active_record/connection_adapters/postgresql_makara_adapter'
 
-if ActiveRecord::VERSION::MAJOR >= 4
-
-  module ActiveRecord
-    module ConnectionHandling
-      def jdbcpostgresql_makara_connection(config)
-        postgresql_makara_connection(config)
-      end
-    end
-  end
-
-else
-
-  module ActiveRecord
-    class Base
-      def self.jdbcpostgresql_makara_connection(config)
-        self.postgresql_makara_connection(config)
-      end
+module ActiveRecord
+  module ConnectionHandling
+    def jdbcpostgresql_makara_connection(config)
+      postgresql_makara_connection(config)
     end
   end
-
 end

data/lib/active_record/connection_adapters/makara_abstract_adapter.rb

@@ -4,18 +4,13 @@ require 'makara'
 module ActiveRecord
   module ConnectionAdapters
     class MakaraAbstractAdapter < ::Makara::Proxy
-
-
       class ErrorHandler < ::Makara::ErrorHandler
-
-
         HARSH_ERRORS = [
           'ActiveRecord::RecordNotUnique',
           'ActiveRecord::InvalidForeignKey',
           'Makara::Errors::BlacklistConnection'
         ].map(&:freeze).freeze
 
-
         CONNECTION_MATCHERS = [
           /(closed|lost|no|terminating|terminated)\s?([^\s]+)?\sconnection/,
           /gone away/,
@@ -32,11 +27,8 @@ module ActiveRecord
           /the database system is (starting|shutting)/
         ].map(&:freeze).freeze
 
-
         def handle(connection)
-
           yield
-
         rescue Exception => e
           # do it via class name to avoid version-specific constant dependencies
           case e.class.name
@@ -49,20 +41,16 @@ module ActiveRecord
               harshly(e)
             end
           end
-
         end
 
-
         def harsh_errors
           HARSH_ERRORS
         end
 
-
         def connection_matchers
           CONNECTION_MATCHERS
         end
 
-
         def connection_message?(message)
           message = message.to_s.downcase
 
@@ -74,7 +62,6 @@ module ActiveRecord
           end
         end
 
-
         def custom_error_message?(connection, message)
           custom_error_matchers = connection._makara_custom_error_matchers
           return false if custom_error_matchers.empty?
@@ -82,7 +69,6 @@ module ActiveRecord
           message = message.to_s
 
           custom_error_matchers.each do |matcher|
-
             if matcher.is_a?(String)
 
               # accept strings that look like "/.../" as a regex
@@ -101,49 +87,43 @@ module ActiveRecord
 
           false
         end
-
-
       end
 
-
       hijack_method :execute, :exec_query, :exec_no_cache, :exec_cache, :transaction
       send_to_all :connect, :reconnect!, :verify!, :clear_cache!, :reset!
 
+      control_method :close, :steal!, :expire, :lease, :in_use?, :owner, :schema_cache, :pool=, :pool,
+         :schema_cache=, :lock, :seconds_idle, :==
+
       SQL_MASTER_MATCHERS           = [/\A\s*select.+for update\Z/i, /select.+lock in share mode\Z/i, /\A\s*select.+(nextval|currval|lastval|get_lock|release_lock|pg_advisory_lock|pg_advisory_unlock)\(/i].map(&:freeze).freeze
       SQL_SLAVE_MATCHERS            = [/\A\s*(select|with.+\)\s*select)\s/i].map(&:freeze).freeze
       SQL_ALL_MATCHERS              = [/\A\s*set\s/i].map(&:freeze).freeze
       SQL_SKIP_STICKINESS_MATCHERS  = [/\A\s*show\s([\w]+\s)?(field|table|database|schema|view|index)(es|s)?/i, /\A\s*(set|describe|explain|pragma)\s/i].map(&:freeze).freeze
 
-
       def sql_master_matchers
         SQL_MASTER_MATCHERS
       end
 
-
       def sql_slave_matchers
         SQL_SLAVE_MATCHERS
       end
 
-
       def sql_all_matchers
         SQL_ALL_MATCHERS
       end
 
-
       def sql_skip_stickiness_matchers
         SQL_SKIP_STICKINESS_MATCHERS
       end
 
-
       def initialize(config)
         @error_handler = ::ActiveRecord::ConnectionAdapters::MakaraAbstractAdapter::ErrorHandler.new
+        @control = ActiveRecordPoolControl.new(self)
         super(config)
       end
 
-
       protected
 
-
       def appropriate_connection(method_name, args, &block)
         if needed_by_all?(method_name, args)
 
@@ -164,29 +144,28 @@ module ActiveRecord
         end
       end
 
-
       def should_stick?(method_name, args)
         sql = coerce_query_to_sql_string(args.first)
         return false if sql_skip_stickiness_matchers.any?{|m| sql =~ m }
+
         super
       end
 
-
       def needed_by_all?(method_name, args)
         sql = coerce_query_to_sql_string(args.first)
         return true if sql_all_matchers.any?{|m| sql =~ m }
+
         false
       end
 
-
       def needs_master?(method_name, args)
         sql = coerce_query_to_sql_string(args.first)
         return true if sql_master_matchers.any?{|m| sql =~ m }
         return false if sql_slave_matchers.any?{|m| sql =~ m }
+
         true
       end
 
-
       def coerce_query_to_sql_string(sql_or_arel)
         if sql_or_arel.respond_to?(:to_sql)
           sql_or_arel.to_sql
@@ -195,18 +174,116 @@ module ActiveRecord
         end
       end
 
-
       def connection_for(config)
         config = Makara::ConfigParser.merge_and_resolve_default_url_config(config)
         active_record_connection_for(config)
       end
 
-
       def active_record_connection_for(config)
         raise NotImplementedError
       end
 
+      class ActiveRecordPoolControl
+        attr_reader :owner
+        alias :in_use? :owner
+
+        def initialize(proxy)
+          @proxy = proxy
+          @owner = nil
+          @pool = nil
+          @schema_cache = ActiveRecord::ConnectionAdapters::SchemaCache.new @proxy
+          @idle_since = Concurrent.monotonic_time
+          @adapter = ActiveRecord::ConnectionAdapters::AbstractAdapter.new(@proxy)
+        end
+
+        def close(*args)
+          @pool.checkin @proxy
+        end
+
+        # this method must only be called while holding connection pool's mutex
+        def lease(*args)
+          if in_use?
+            msg = +"Cannot lease connection, "
+            if @owner == Thread.current
+              msg << "it is already leased by the current thread."
+            else
+              msg << "it is already in use by a different thread: #{@owner}. " \
+                    "Current thread: #{Thread.current}."
+            end
+            raise ActiveRecordError, msg
+          end
+          @owner = Thread.current
+        end
+
+        # this method must only be called while holding connection pool's mutex
+        def expire(*args)
+          if in_use?
+            if @owner != Thread.current
+              raise ActiveRecordError, "Cannot expire connection, " \
+                "it is owned by a different thread: #{@owner}. " \
+                "Current thread: #{Thread.current}."
+            end
+
+            @idle_since = Concurrent.monotonic_time
+            @owner = nil
+          else
+            raise ActiveRecordError, "Cannot expire connection, it is not currently leased."
+          end
+        end
+
+        # Seconds since this connection was returned to the pool
+        def seconds_idle(*args)
+          return 0 if in_use?
+
+          Concurrent.monotonic_time - @idle_since
+        end
+
+        # this method must only be called while holding connection pool's mutex (and a desire for segfaults)
+        def steal!(*args)
+          if in_use?
+            if @owner != Thread.current
+              @pool.send :remove_connection_from_thread_cache, @proxy, @owner
+              @owner = Thread.current
+            end
+          else
+            raise ActiveRecordError, "Cannot steal connection, it is not currently leased."
+          end
+        end
+
+        def schema_cache(*args)
+          if @pool.respond_to?(:get_schema_cache) # AR6
+            @pool.get_schema_cache(@proxy)
+          else
+            @schema_cache
+          end
+        end
+
+        def schema_cache=(*args)
+          cache = args[0]
+          cache.connection = @proxy
+          if @pool.respond_to?(:set_schema_cache) # AR6
+            @pool.set_schema_cache(cache)
+          else
+            @schema_cache = cache
+          end
+        end
+
+        def lock(*args)
+          @adapter.lock
+        end
+
+        def pool=(*args)
+          @pool = args[0]
+        end
 
+        def pool(*args)
+          @pool
+        end
+
+        def ==(*args)
+          @proxy.object_id == args[0].object_id
+        end
+      end
     end
   end
 end