active_record_host_pool 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 902e5e0cb2f51303355efa11fe7d25d357d6c9560310cab1e3e6bc5c0ad1758b
-  data.tar.gz: 9584c62c0572915b4de0aff99b2449a787c6236d3828e3858b6a6c2079ef1882
+  metadata.gz: 48f4b996cc1630787e9d61bf8f138deb1fe1b1162ba242ac860802287750a807
+  data.tar.gz: 1980813b23f714d9e7460df499307b3dfb06d3cc90c44226f52f68fc2c9f3e72
 SHA512:
-  metadata.gz: 400906a1082b28c51d7bbcd3efffed956e4e26ce46c8bc2e71a73431ce1028eafcbfef06a0b3a220647ea3e5865b1d9ac8b2dd34960bba76d7ca059339daaf0a
-  data.tar.gz: 8094cbe8a0497f5d16cb7caa27953d4e78e2945cd46f53e00912654b2fff7cb447c8dc323b0faeebc74f3c425bd9e6a2b86f4546485e46171616a3cd2b6f10e3
+  metadata.gz: 6b0234af923f2818200c0f3a28a8c56c98d89ba6d640e9aeb9038fc8ebb504d6030b22a7675e920c47c0c2aedf25a6426959f0f59d0a0ab3e4047ebaad1ae23a
+  data.tar.gz: 4f03daf7d20486e837bf28d03b5032c48db403bb9075c00ea181c2a57b8070b7c68cd9886a252d41ad03ff5a54ccc5b095033636fd4c5f75359fde52d67c17a6

data/Readme.md

@@ -24,6 +24,14 @@ You need a local user called 'john-doe'.
     GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX  ON *.* TO 'john-doe'@'localhost';
     FLUSH PRIVILEGES;
 
+With mysql running locally, run
+
+    BUNDLE_GEMFILE=gemfiles/rails5.2.gemfile bundle exec rake test
+
+ Or
+
+    BUNDLE_GEMFILE=gemfiles/rails5.2.gemfile ruby test/test_arhp.rb --seed 19911 --verbose
+
 ## Copyright
 
 Copyright (c) 2011 Zendesk. See MIT-LICENSE for details.

data/lib/active_record_host_pool/pool_proxy.rb

@@ -84,6 +84,34 @@ module ActiveRecordHostPool
       _clear_connection_proxy_cache
     end
 
+    def release_connection(owner_thread = Thread.current)
+      p = _connection_pool(false)
+      return unless p
+
+      p.release_connection(owner_thread)
+    end
+
+    def flush!
+      p = _connection_pool(false)
+      return unless p
+
+      p.flush!
+    end
+
+    def discard!
+      p = _connection_pool(false)
+      return unless p
+
+      p.discard!
+
+      # All connections in the pool (even if they're currently
+      # leased!) have just been discarded, along with the pool itself.
+      # Any further interaction with the pool (except #spec and #schema_cache)
+      # is undefined.
+      # Remove the connection for the given key so a new one can be created in its place
+      _connection_pools.delete(_pool_key)
+    end
+
     private
 
     def rescuable_errors

data/lib/active_record_host_pool/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordHostPool
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/test/test_arhp.rb

@@ -13,6 +13,23 @@ class ActiveRecordHostPoolTest < Minitest::Test
     Phenix.burn!
   end
 
+  def test_process_forking_with_connections
+    # Ensure we have a connection already
+    assert_equal(true, ActiveRecord::Base.connected?)
+
+    # Verify that when we fork, the process doesn't crash
+    pid = Process.fork do
+      if ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR == 2
+        assert_equal(false, ActiveRecord::Base.connected?) # New to Rails 5.2
+      else
+        assert_equal(true, ActiveRecord::Base.connected?)
+      end
+    end
+    Process.wait(pid)
+    # Cleanup any connections we may have left around
+    ActiveRecord::Base.connection_handler.clear_all_connections!
+  end
+
   def test_models_with_matching_hosts_should_share_a_connection
     assert_equal(Test1.connection.raw_connection, Test2.connection.raw_connection)
     assert_equal(Test3.connection.raw_connection, Test4.connection.raw_connection)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord