rails-sharding 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96b5ada6418c66eb271dff04d02ffc221e4790016b0d37ac7cd46303df8c6753
-  data.tar.gz: 8937dffd4ac3233f435447ac0c2ef1aba837cd6f0ea86bf8e22a49cbdcb1161e
+  metadata.gz: '06952a8d4b285bc681adc59a8653eddc1222432d5b62cd4d97462fab6ff63770'
+  data.tar.gz: a3d9cf13268beaeda50dbb44961afce736ba5df0793ef0aafe20ba37fe2ab155
 SHA512:
-  metadata.gz: 23c77ba2a1b8d967054a8885c33e78fdbe39dfe89eeaff38ee0b2e7e5003e4e286e8b965ba560aae7d01dbbac3ba008149e732354f436206525bd724f561684f
-  data.tar.gz: 49ceb4e48cd139db5d197eddcf7dbc4511f8a6e2ab82a26ca3cc6f2065e7ee82d56d45389148f7268ee3d05b6ad7fb264dca81074858d4c1a0f36d4b444158e7
+  metadata.gz: 569ea9f4ae0fe748b696fa10aa1af66b2dca6b82231eeb523187f424ecbeec20d21783e8f200076672bf0389f46966bb55f6be3be4ae270071e532bb91f7e2a7
+  data.tar.gz: bd63818ba25d2d836c116aca83f1b2267a6288f76bce34d0ff93cdcae055e13bf7d20e51eee1d0c87005df6e187cf00da5a6d0bdefa1a761abfbfa9bede1f0e9

data/README.md

@@ -8,13 +8,13 @@
 
 Simple and robust sharding gem for Rails, including Migrations and ActiveRecord extensions
 
-This gems allows you to easily create extra databases to your rails application, and freely allocate ActiveRecord instances to any of the databases. 
+This gems allows you to easily create extra databases to your rails application, and freely allocate ActiveRecord instances to any of the databases.
 
 Accessing shards is as simple as:
 ```ruby
   # creating a user to a specific shard
   new_user = User.using_shard(:shard_group1, :shard1).create(username: 'x')
-  
+
   # retrieving a user from a specific shard
   loaded_user = User.using_shard(:shard_group1, :shard1).where(username: 'x').first
 ```
@@ -23,7 +23,7 @@ You can also use the block syntax:
 ```ruby
   Rails::Sharding.using_shard(:shard_group1, :shard1) do
     # All statements inside this block will go to the selected shard
-    
+
     # Do some queries
     new_user = User.create(username: 'x')
     loaded_user = User.where(username: 'x').first
@@ -35,7 +35,7 @@ You can also pick and choose which models will be shardable. Non shardable model
 
 ## Compatibility
 Gem version 1.x.x:
-* Rails 5.0 and 5.1
+* Rails 5.0, 5.1 and 5.2
 * Databases: MySQL, MariaDB, Postgres
 
 Gem version 0.x.x:
@@ -85,7 +85,7 @@ development:
 ...
 ```
 
-Rename it to `config/shards.yml` and change it to your database configuration. This example file defines a single shard group (named `shard_group1`) containing two shards (`shard1` and `shard2`). 
+Rename it to `config/shards.yml` and change it to your database configuration. This example file defines a single shard group (named `shard_group1`) containing two shards (`shard1` and `shard2`).
 
 **A shard group is a set of shards that should have the same schema.**
 
@@ -95,7 +95,7 @@ rake shards:create
 ```
 
 ## Migrating Shards
-Go to the directory `db/shards_migrations/shard_group1` and add all migrations that you want to run on the shards of `shard_group1`. By design, all shards in a same group should always have the same schema. 
+Go to the directory `db/shards_migrations/shard_group1` and add all migrations that you want to run on the shards of `shard_group1`. By design, all shards in a same group should always have the same schema.
 
 
 As of now, there is no generator for migrations. You can use the regular rails generator and move the migrations to the `shards_migration` folder.
@@ -195,11 +195,11 @@ Want to know more? How to integrate with RSpec, Capistrano, etc? Take a look at
 
 After checking out the repo:
 
-1. Run `bundle` to install gems 
+1. Run `bundle` to install gems
 
 1. Create your `spec/fixtures/shards.yml` based on the example on this same folder (you need MySQL and Postgres)
 
-1. Run `rake db:test:prepare` to create the test shards. 
+1. Run `rake db:test:prepare` to create the test shards.
 
 1. Run `rspec` to run the tests.
 

data/lib/rails/sharding/active_record_extensions.rb

@@ -78,7 +78,7 @@ module Rails::Sharding
       alias_method :eql?, :==
     end
 
-    # Fixes case when behavior when ScopeProxy is passed to case
+    # Fixes case-when behavior when ScopeProxy is passed to case
     # (otherwise classes don't match)
     module CaseFixer
       def ===(other)

data/lib/rails/sharding/shardable_model.rb

@@ -52,7 +52,7 @@ module Rails::Sharding
         end
       end
 
-      # @overrides ActiveRecord::ConnectionHandling#sharded_connected?
+      # @overrides ActiveRecord::ConnectionHandling#connected?
       def sharded_connected?
         if ShardThreadRegistry.connecting_to_master?
           return original_connected?
@@ -107,6 +107,15 @@ module Rails::Sharding
           return ConnectionHandler.connection_handler.clear_all_connections!
         end
       end
+
+      # @overrides ActiveRecord::ConnectionHandling#flush_idle_connections!
+      def sharded_flush_idle_connections!
+        if ShardThreadRegistry.connecting_to_master?
+          return original_flush_idle_connections!
+        else
+          return ConnectionHandler.connection_handler.flush_idle_connections!
+        end
+      end
     end
 
   end

data/lib/rails/sharding/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Sharding
-    VERSION = "1.1.3"
+    VERSION = "1.2.0"
   end
 end

data/rails-sharding.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'rails', '~> 5.1.0'
+  spec.add_runtime_dependency 'rails', '~> 5.2.0'
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 13.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-sharding
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Henrique Gubert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2020-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement