replica_pools 2.1.1 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ccf84c0499a86c7e36948d178c8fb150fc71003b
-  data.tar.gz: 93bc95a40cd6a411ea255bc3fc94e2e8860add71
+SHA256:
+  metadata.gz: b9a32096014e9f2cd137adb7c8fe226173f40d9dea893a319c0dab24cbdf8371
+  data.tar.gz: da62952df8213322963f8b8ce0c5da9ed8efe381c2348801794ec0ef0b6d294a
 SHA512:
-  metadata.gz: 947621a358c1034cc8a45b70e1f56d1a58126552c700ec18f3e636cfbd80f44eeb9c3288ad3cc78f142a52a3a9df7668cc746f14ba71cd242596998d96bd3182
-  data.tar.gz: 4cc0aab455a96d11d2c56fb17e3af40ec8ae33502bf1a70064c71c9e26a043f41ea7ab47937923735408827bb358cb766d5e8dadedeefe57b1206df8ba44e302
+  metadata.gz: 7f2d2abc5f7badb102c8116213b306d35336f6d54c651a74d6fcaa0e37c53c5282c46fbc643984ffde43f5e54d868051c38590372b8af4329741da1247b68128
+  data.tar.gz: 51c4514ec6e0fa79ea2e6b128fd4d6d3866916d65d89ec743f49621678a5997c0dd3bc0bfe78a25acd72c39d61c5f13523a9f84a9160259966f9408f9c56b109

data/README.md

@@ -186,11 +186,15 @@ Then you can run tests with:
 $ bundle exec rake spec
 ```
 
+## Releasing a New Version
+
+First bump the version as appropriate in `lib/replica_pools/version.rb` and then run `bundle exec rake release`. This will push git tags to github and package and push the gem to rubygems.org.
+
 ## Authors
 
 Author: Dan Drabik, Lance Ivy
 
-Copyright (c) 2012-2018, Kickstarter
+Copyright (c) 2012-2021, Kickstarter
 
 Released under the MIT license
 

data/lib/replica_pools/engine.rb

@@ -21,15 +21,15 @@ module ReplicaPools
             :select_rows, :select, :verify!, :raw_connection, :active?, :reconnect!,
             :disconnect!, :reset_runtime, :log
           ]
-        elsif ActiveRecord::VERSION::MAJOR == 5
+        elsif [5, 6].include?(ActiveRecord::VERSION::MAJOR)
           [
            :select_all, :select_one, :select_value, :select_values,
            :select_rows, :select, :select_prepared, :verify!, :raw_connection,
            :active?, :reconnect!, :disconnect!, :reset_runtime, :log,
            :lookup_cast_type_from_column, :sanitize_limit,
-           :combine_bind_parameters, :quote_table_name, :quote, :quote_column_names, :quote_table_names,
+           :combine_bind_parameters, :quote_table_name, :quote, :quote_column_names, :quote_table_names, :table_alias_for,
            :case_sensitive_comparison, :case_insensitive_comparison,
-           :schema_cache, :cacheable_query, :prepared_statements, :clear_cache!
+           :schema_cache, :cacheable_query, :prepared_statements, :clear_cache!, :column_name_for_operation
           ]
         else
           warn "Unsupported ActiveRecord version #{ActiveRecord.version}. Please whitelist the safe methods."

data/lib/replica_pools/pools.rb

@@ -27,12 +27,22 @@ module ReplicaPools
 
     # finds valid pool configs
     def pool_configurations
-      ActiveRecord::Base.configurations.map do |name, config|
+      config_hash.map do |name, config|
         next unless name.to_s =~ /#{ReplicaPools.config.environment}_pool_(.*)_name_(.*)/
         [name, $1, $2]
       end.compact
     end
 
+    def config_hash
+      if ActiveRecord::VERSION::MAJOR >= 6
+        # in Rails >= 6, `configurations` is an instance of ActiveRecord::DatabaseConfigurations
+        ActiveRecord::Base.configurations.to_h
+      else
+        # in Rails < 6, it's just a hash
+        ActiveRecord::Base.configurations
+      end
+    end
+
     # generates a unique ActiveRecord::Base subclass for a single replica
     def connection_class(pool_name, replica_name, connection_name)
       class_name = "#{pool_name.camelize}#{replica_name.camelize}"

data/lib/replica_pools/query_cache.rb

@@ -24,6 +24,8 @@ module ReplicaPools
       # there may be more args for Rails 5.0+, but we only care about arel, name, and binds for caching.
       relation, name, raw_binds = args
 
+      # Rails 6.2 breaks this method as locked? is no longer available
+      # https://github.com/kickstarter/replica_pools/issues/26
       if !query_cache_enabled || locked?(relation)
         return route_to(current, :select_all, *args)
       end
@@ -32,7 +34,7 @@ module ReplicaPools
       if raw_binds.blank? && relation.is_a?(ActiveRecord::Relation)
         arel, binds = relation.arel, relation.bind_values
       else
-        arel, binds = relation, raw_binds
+        arel, binds = relation, Array(raw_binds)
       end
 
       sql = to_sql(arel, binds)

data/lib/replica_pools/version.rb

@@ -1,3 +1,3 @@
 module ReplicaPools
-  VERSION = "2.1.1"
+  VERSION = "2.2.1"
 end

data/spec/query_cache_spec.rb

@@ -1,5 +1,6 @@
 require 'rack'
 require_relative 'spec_helper'
+require_relative 'config/test_model'
 
 describe ReplicaPools::QueryCache do
   before(:each) do
@@ -103,4 +104,16 @@ describe ReplicaPools::QueryCache do
       end
     end
   end
+
+  describe '.pluck regression test' do
+    it 'should work with query caching' do
+      TestModel.connection.enable_query_cache!
+      expect(TestModel.pluck(:id).count).to eql TestModel.all.count
+    end
+
+    it 'should work if query cache is not enabled' do
+      TestModel.connection.disable_query_cache!
+      expect(TestModel.pluck(:id).count).to eql TestModel.all.count
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: replica_pools
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.1
 platform: ruby
 authors:
 - Dan Drabik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -95,6 +95,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Connection proxy for ActiveRecord for leader / replica setups.
 email: dan@kickstarter.com
 executables: []
@@ -138,8 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Connection proxy for ActiveRecord for leader / replica setups.