makara 0.3.9 → 0.5.1

data/CHANGELOG.md

@@ -1,74 +1,130 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## v0.3.8 - 2016-07-11
+## Unreleased
 
-[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.7...v0.3.8) 
+### 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/instacart/makara/compare/v0.4.0...v0.4.1)
+
+- 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/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/instacart/makara/pull/194) Rosa Gutierrez
+
+
+## v0.3.10 - 2018-03-20
+[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/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/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/instacart/makara/compare/v0.3.8...v0.3.9)
+
+Changed
+- Add postgis support [#118](https://github.com/instacart/makara/pull/118) Kevin Bacha
+
+## v0.3.8 - 2017-07-11
+
+[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
 
@@ -76,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
 
@@ -86,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', :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`.
@@ -61,40 +54,50 @@ This implementation will send any request not like "SELECT..." to a master conne
 
 Makara comes with a config parser which will handle providing subconfigs to the `connection_for` method. Check out the ActiveRecord database.yml example below for more info.
 
-### Context
+### Stickiness Context
 
-Makara handles stickyness by keeping track of a context (sha). In a multi-instance environment it persists a context in a cache. If Rails is present it will automatically use Rails.cache. You can provide any kind of store as long as it responds to the methods required in [lib/makara/cache.rb](lib/makara/cache.rb).
+Makara handles stickiness by keeping track of which proxies are stuck at any given moment. The context is basically a mapping of proxy ids to the timestamp until which they are stuck.
 
-```ruby
-Makara::Cache.store = MyRedisCacheStore.new
-```
+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.
 
-To handle persistence of context across requests in a Rack app, makara provides a middleware. It lays a cookie named `_mkra_ctxt` which contains the current master context. If the next request is executed before the cookie expires, master will be used. If something occurs which naturally requires master on the second request, the context is changed and stored again.
+#### Releasing stuck connections (clearing context)
 
-#### Changing Context
+If you need to clear the current context, releasing any stuck connections, all you have to do is:
 
-If you need to change the makara context, releasing any stuck connections, all you have to do is:
+```ruby
+Makara::Context.release_all
+```
 
+You can also clear stuck connections for a specific proxy:
 ```ruby
-ctx = Makara::Context.generate # or any unique sha
-Makara::Context.set_current ctx
+Makara::Context.release(proxy_id)
+Makara::Context.release('mysql_main')
+Makara::Context.release('redis')
+...
 ```
 
 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.
 
 
-### Forcing Master
+#### Forcing Master
 
 If you need to force master in your app then you can simply invoke stick_to_master! on your connection:
 
 ```ruby
-write_to_cache = true # or false
-proxy.stick_to_master!(write_to_cache)
+persist = true # or false, it's true by default
+proxy.stick_to_master!(persist)
 ```
 
+It'll keep the proxy stuck to master for the current request, and if `persist = true` (default), it'll be also stored in the context for subsequent requests, keeping the proxy stuck up to the duration of `master_ttl` configured for the proxy.
 
-### Skipping the Stickiness
+#### Skipping the Stickiness
 
 If you're using the `sticky: true` configuration and you find yourself in a situation where you need to write information through the proxy but you don't want the context to be stuck to master, you should use a `without_sticking` block:
 
@@ -120,7 +123,13 @@ By creating a makara database adapter which simply acts as a proxy we avoid any
 
 ### What goes where?
 
-Any `SELECT` statements will execute against your slave(s), anything else will go to master. The only edge case is `SET` operations which are sent to all connections. Execution of specific methods such as `connect!`, `disconnect!`, and `clear_cache!` are invoked on all underlying connections.
+In general: Any `SELECT` statements will execute against your slave(s), anything else will go to master.
+
+There are some edge cases:
+* `SET` operations will be sent to all connections
+* Execution of specific methods such as `connect!`, `disconnect!`, and `clear_cache!` are invoked on all underlying connections
+* Calls inside a transaction will always be sent to the master (otherwise changes from within the transaction could not be read back on most transaction isolation levels)
+* Locking reads (e.g. `SELECT ... FOR UPDATE`) will always be sent to the master
 
 ### Errors / blacklisting
 
@@ -139,6 +148,8 @@ production:
   # add a makara subconfig
   makara:
 
+    # optional id to identify the proxy with this configuration for stickiness
+    id: mysql
     # the following are default values
     blacklist_duration: 5
     master_ttl: 5
@@ -161,11 +172,13 @@ Let's break this down a little bit. At the top level of your config you have the
 Following the adapter choice is all the standard configurations (host, port, retry, database, username, password, etc). With all the standard configurations provided, you can now provide the makara subconfig.
 
 The makara subconfig sets up the proxy with a few of its own options, then provides the connection list. The makara options are:
+* id - an identifier for the proxy, used for sticky behaviour and context. The default is to use a MD5 hash of the configuration contents, so if you are setting `sticky` to true, it's a good idea to also set an `id`. Otherwise any stuck connections will be cleared if the configuration changes (as the default MD5 hash id would change as well)
 * blacklist_duration - the number of seconds a node is blacklisted when a connection failure occurs
 * disable_blacklist - do not blacklist node at any error, useful in case of one master
 * sticky - if a node should be stuck to once it's used during a specific context
 * master_ttl - how long the master context is persisted. generally, this needs to be longer than any replication lag
-* master_strategy - use a different strategy for picking the "current" node: `failover` will try to keep the same one until it is blacklisted. The default is `round_robin` which will cycle through available ones.
+* master_strategy - use a different strategy for picking the "current" master node: `failover` will try to keep the same one until it is blacklisted. The default is `round_robin` which will cycle through available ones.
+* slave_strategy - use a different strategy for picking the "current" slave node: `failover` will try to keep the same one until it is blacklisted. The default is `round_robin` which will cycle through available ones.
 * connection_error_matchers - array of custom error matchers you want to be handled gracefully by Makara (as in, errors matching these regexes will result in blacklisting the connection as opposed to raising directly).
 
 Connection definitions contain any extra node-specific configurations. If the node should behave as a master you must provide `role: master`. Any previous configurations can be overridden within a specific node's config. Nodes can also contain weights if you'd like to balance usage based on hardware specifications. Optionally, you can provide a name attribute which will be used in sql logging.
@@ -268,16 +281,7 @@ def handle_request_after_third_party_record_creation
 end
 ```
 
-Similarly, if you have a third party service which will conduct a generic request against your Rack app, you can force master via a query param:
-
-```ruby
-def send_url_to_third_party
-  context = Makara::Context.get_current
-  ThirdParty.read_from_here!("http://mysite.com/path/to/resource?_mkra_ctxt=#{context}")
-end
-```
-
 ## Todo
 
-* Cookie based cache store?
+* Support for providing context as query param
 * More real world examples

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