makara 0.5.0 → 0.5.1

data/CHANGELOG.md

@@ -1,16 +1,24 @@
 # 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
+- 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
 
 

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', '2.2.3'
-
-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,6 +1,7 @@
 # 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)
 
 

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,54 +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)
 
@@ -169,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
@@ -200,13 +174,11 @@ 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

data/lib/active_record/connection_adapters/makara_jdbcmysql_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/makara_mysql2_adapter'
 
-if ActiveRecord::VERSION::MAJOR >= 4
-
-  module ActiveRecord
-    module ConnectionHandling
-      def makara_jdbcmysql_connection(config)
-        makara_mysql2_connection(config)
-      end
-    end
-  end
-
-else
-
-  module ActiveRecord
-    class Base
-      def self.makara_jdbcmysql_connection(config)
-        self.makara_mysql2_connection(config)
-      end
+module ActiveRecord
+  module ConnectionHandling
+    def makara_jdbcmysql_connection(config)
+      makara_mysql2_connection(config)
     end
   end
-
 end

data/lib/active_record/connection_adapters/makara_jdbcpostgresql_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/makara_postgresql_adapter'
 
-if ActiveRecord::VERSION::MAJOR >= 4
-
-  module ActiveRecord
-    module ConnectionHandling
-      def makara_jdbcpostgresql_connection(config)
-        makara_postgresql_connection(config)
-      end
-    end
-  end
-
-else
-
-  module ActiveRecord
-    class Base
-      def self.makara_jdbcpostgresql_connection(config)
-        self.makara_postgresql_connection(config)
-      end
+module ActiveRecord
+  module ConnectionHandling
+    def makara_jdbcpostgresql_connection(config)
+      makara_postgresql_connection(config)
     end
   end
-
 end

data/lib/active_record/connection_adapters/makara_mysql2_adapter.rb

@@ -1,32 +1,17 @@
 require 'active_record/connection_adapters/makara_abstract_adapter'
 require 'active_record/connection_adapters/mysql2_adapter'
 
-if ActiveRecord::VERSION::MAJOR >= 4
-
-  module ActiveRecord
-    module ConnectionHandling
-      def makara_mysql2_connection(config)
-        ActiveRecord::ConnectionAdapters::MakaraMysql2Adapter.new(config)
-      end
-    end
-  end
-
-else
-
-  module ActiveRecord
-    class Base
-      def self.makara_mysql2_connection(config)
-        ActiveRecord::ConnectionAdapters::MakaraMysql2Adapter.new(config)
-      end
+module ActiveRecord
+  module ConnectionHandling
+    def makara_mysql2_connection(config)
+      ActiveRecord::ConnectionAdapters::MakaraMysql2Adapter.new(config)
     end
   end
-
 end
 
 module ActiveRecord
   module ConnectionAdapters
     class MakaraMysql2Adapter < ActiveRecord::ConnectionAdapters::MakaraAbstractAdapter
-
       class << self
         def visitor_for(*args)
           ActiveRecord::ConnectionAdapters::Mysql2Adapter.visitor_for(*args)
@@ -38,7 +23,6 @@ module ActiveRecord
       def active_record_connection_for(config)
         ::ActiveRecord::Base.mysql2_connection(config)
       end
-
     end
   end
 end

data/lib/active_record/connection_adapters/makara_postgis_adapter.rb

@@ -1,29 +1,14 @@
 require 'active_record/connection_adapters/makara_abstract_adapter'
 require 'active_record/connection_adapters/postgis_adapter'
 
-if ActiveRecord::VERSION::MAJOR >= 4
-
-  module ActiveRecord
-    module ConnectionHandling
-      def makara_postgis_connection(config)
-        ActiveRecord::ConnectionAdapters::MakaraPostgisAdapter.new(config)
-      end
-    end
-  end
-
-else
-
-  module ActiveRecord
-    class Base
-      def self.makara_postgis_connection(config)
-        ActiveRecord::ConnectionAdapters::MakaraPostgisAdapter.new(config)
-      end
+module ActiveRecord
+  module ConnectionHandling
+    def makara_postgis_connection(config)
+      ActiveRecord::ConnectionAdapters::MakaraPostgisAdapter.new(config)
     end
   end
-
 end
 
-
 module ActiveRecord
   module ConnectionAdapters
     class MakaraPostgisAdapter < ActiveRecord::ConnectionAdapters::MakaraAbstractAdapter