rails-sharding 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06952a8d4b285bc681adc59a8653eddc1222432d5b62cd4d97462fab6ff63770'
-  data.tar.gz: a3d9cf13268beaeda50dbb44961afce736ba5df0793ef0aafe20ba37fe2ab155
+  metadata.gz: b567029d770be424e7c1141bd5f483fd5fee49a630ee31248d66af9d57976ab9
+  data.tar.gz: 0aa3dd59efebe3aba5949784fcd342d3595dbe719057db9a68341480d3dae9bd
 SHA512:
-  metadata.gz: 569ea9f4ae0fe748b696fa10aa1af66b2dca6b82231eeb523187f424ecbeec20d21783e8f200076672bf0389f46966bb55f6be3be4ae270071e532bb91f7e2a7
-  data.tar.gz: bd63818ba25d2d836c116aca83f1b2267a6288f76bce34d0ff93cdcae055e13bf7d20e51eee1d0c87005df6e187cf00da5a6d0bdefa1a761abfbfa9bede1f0e9
+  metadata.gz: 88089653b9b9c99acb012872175d426d5b60aad54b7e65a2d98afb6b128c7b7a1e904cdc62d06db1d68bd4c3d2589d1ed5cc7e6537d9ced97bc2f9e0044ba35b
+  data.tar.gz: 338d7f533b28c46625a0102cc861932a8819bde1084a02b37cf8a7ae1593b948bd35aefc6b0c5355967399453a70232f28bb465aaefdb86aaf2fe965c1d3b4c1

data/lib/rails/sharding/core.rb

@@ -33,7 +33,7 @@ module Rails::Sharding
       environment_config = @@db_configs[environment]
       return environment_config if environment_config
 
-      raise Errors::ConfigNotFoundError, 'Found no shard configurations for enviroment "' + environment + '" in ' + Config.shards_config_file.to_s + ' file was not found'
+      raise Errors::ConfigNotFoundError, 'Found no shard configurations for environment "' + environment + '" in ' + Config.shards_config_file.to_s + ' file was not found'
     rescue Errno::ENOENT
       raise Errors::ConfigNotFoundError, Config.shards_config_file.to_s + ' file was not found'
     end
@@ -57,11 +57,11 @@ module Rails::Sharding
     # yields a block for each shard in each shard group, with its configurations
     # shard_group_filter: if passed yields only shards of this group
     # shard_name_filter: if passed yields only shards with this name
-    def self.for_each_shard(shard_group_filter=nil, shard_name_filter=nil)
+    def self.for_each_shard(environment:Rails.env, shard_group_filter:nil, shard_name_filter:nil)
       shard_group_filter.to_s if shard_group_filter
       shard_name_filter.to_s if shard_name_filter
 
-      configurations.each do |shard_group, shards_configurations|
+      configurations(environment).each do |shard_group, shards_configurations|
         next if shard_group_filter && shard_group_filter != shard_group.to_s
 
         shards_configurations.each do |shard, configuration|

data/lib/rails/sharding/version.rb

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

data/lib/tasks/rails-sharding.rake

@@ -27,25 +27,32 @@ shards_namespace = namespace :shards do
 
   desc "Creates database shards (options: RAILS_ENV=x SHARD_GROUP=x SHARD=x)"
   task create: [:environment] do
-    Rails::Sharding.for_each_shard(ENV["SHARD_GROUP"], ENV["SHARD"]) do |shard_group, shard, configuration|
-      puts "== Creating shard #{shard_group}:#{shard}"
-      ActiveRecord::Tasks::DatabaseTasks.create(configuration)
+    # creates DB for both development and test envs, when in development
+    each_current_environment do |environment|
+      Rails::Sharding.for_each_shard(environment: environment, shard_group_filter: ENV["SHARD_GROUP"], shard_name_filter: ENV["SHARD"]) do |shard_group, shard, configuration|
+        puts "== Creating shard #{shard_group}:#{shard}"
+
+        ActiveRecord::Tasks::DatabaseTasks.create(configuration)
+      end
     end
   end
 
   desc "Drops database shards (options: RAILS_ENV=x SHARD_GROUP=x SHARD=x)"
   task drop: [:environment, :check_protected_environments] do
-    Rails::Sharding.for_each_shard(ENV["SHARD_GROUP"], ENV["SHARD"]) do |shard_group, shard, configuration|
-      puts "== Dropping shard #{shard_group}:#{shard}"
+    # drops DB for both development and test envs, when in development
+    each_current_environment do |environment|
+      Rails::Sharding.for_each_shard(shard_group_filter: ENV["SHARD_GROUP"], shard_name_filter: ENV["SHARD"]) do |shard_group, shard, configuration|
+        puts "== Dropping shard #{shard_group}:#{shard}"
 
-      # closes connections with shard before dropping (postgres requires this, mysql does not but there is no harm)
-      Rails::Sharding::ConnectionHandler.remove_connection(shard_group, shard)
+        # closes connections with shard before dropping (postgres requires this, mysql does not but there is no harm)
+        Rails::Sharding::ConnectionHandler.remove_connection(shard_group, shard)
 
-      ActiveRecord::Tasks::DatabaseTasks.drop(configuration)
+        ActiveRecord::Tasks::DatabaseTasks.drop(configuration)
 
-      # reestablishes connection (because we removed before). You can do this even if the database does not exist yet,
-      # you just cannot retrieve the connection yet.
-      Rails::Sharding::ConnectionHandler.establish_connection(shard_group, shard)
+        # reestablishes connection (because we removed before). You can do this even if the database does not exist yet,
+        # you just cannot retrieve the connection yet.
+        Rails::Sharding::ConnectionHandler.establish_connection(shard_group, shard)
+      end
     end
   end
 
@@ -91,7 +98,7 @@ shards_namespace = namespace :shards do
     task dump: [:_make_activerecord_base_shardable] do
       require "active_record/schema_dumper"
 
-      Rails::Sharding.for_each_shard(ENV["SHARD_GROUP"], ENV["SHARD"]) do |shard_group, shard, _configuration|
+      Rails::Sharding.for_each_shard(shard_group_filter: ENV["SHARD_GROUP"], shard_name_filter: ENV["SHARD"]) do |shard_group, shard, _configuration|
         puts "== Dumping schema of #{shard_group}:#{shard}"
 
         schema_filename = shard_schema_path(shard_group, shard)
@@ -216,7 +223,7 @@ shards_namespace = namespace :shards do
 
   desc "Retrieves the current schema version number"
   task version: [:_make_activerecord_base_shardable] do
-    Rails::Sharding.for_each_shard(ENV["SHARD_GROUP"], ENV["SHARD"]) do |shard_group, shard, _configuration|
+    Rails::Sharding.for_each_shard(shard_group_filter: ENV["SHARD_GROUP"], shard_name_filter: ENV["SHARD"]) do |shard_group, shard, _configuration|
       Rails::Sharding.using_shard(shard_group, shard) do
         puts "Shard #{shard_group}:#{shard} version: #{ActiveRecord::Migrator.current_version}"
       end
@@ -273,32 +280,23 @@ shards_namespace = namespace :shards do
     end
 
     desc "Empty the test shards (drops all tables) (options: SHARD_GROUP=x, SHARD=x)"
-    task :purge => [:_make_activerecord_base_shardable] do
-      begin
-        # saves the current RAILS_ENV (we must change it so the environment is set correcly on the metadata table)
-        initial_rails_env = Rails.env
-        Rails.env = 'test'
-
-        Rails::Sharding.for_each_shard(ENV["SHARD_GROUP"], ENV["SHARD"]) do |shard_group, shard, configuration|
-          puts "== Purging test shard #{shard_group}:#{shard}"
-          begin
-            # establishes connection with test shard, saving if it was connected before (rails 4.2 doesn't do this, but should)
-            should_reconnect = Rails::Sharding::ConnectionHandler.connection_pool(shard_group, shard).active_connection?
-            Rails::Sharding::ConnectionHandler.establish_connection(shard_group, shard, 'test')
-  
-            Rails::Sharding.using_shard(shard_group, shard) do
-              ActiveRecord::Tasks::DatabaseTasks.purge(configuration)
-            end
-          ensure          
-            if should_reconnect
-              # reestablishes connection for RAILS_ENV environment (whatever that is)
-              Rails::Sharding::ConnectionHandler.establish_connection(shard_group, shard)
-            end
+    task purge: [:_make_activerecord_base_shardable] do
+      Rails::Sharding.for_each_shard(environment: 'test', shard_group_filter: ENV["SHARD_GROUP"], shard_name_filter: ENV["SHARD"]) do |shard_group, shard, configuration|
+        puts "== Purging test shard #{shard_group}:#{shard}"
+        begin
+          # establishes connection with test shard, saving if it was connected before (rails 4.2 doesn't do this, but should)
+          should_reconnect = Rails::Sharding::ConnectionHandler.connection_pool(shard_group, shard).active_connection?
+          Rails::Sharding::ConnectionHandler.establish_connection(shard_group, shard, 'test')
+
+          Rails::Sharding.using_shard(shard_group, shard) do
+            ActiveRecord::Tasks::DatabaseTasks.purge(configuration)
+          end
+        ensure
+          if should_reconnect
+            # reestablishes connection for RAILS_ENV environment (whatever that is)
+            Rails::Sharding::ConnectionHandler.establish_connection(shard_group, shard)
           end
         end
-      ensure
-        # restores rails env
-        Rails.env = initial_rails_env
       end
     end
   end
@@ -325,4 +323,13 @@ shards_namespace = namespace :shards do
     raise error_message unless version
     version
   end
+
+  def each_current_environment
+    environments = [Rails.env]
+    environments << "test" if environments == ["development"]
+
+    environments.each do |env|
+      yield env
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-sharding
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Henrique Gubert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails