active_record_shards 3.11.5 → 3.12.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d357ad8613bcbea31498900f8e1d97b5d21bfc1b8259372268e456bdaad77a2
-  data.tar.gz: 1c0d9c52923910fbacb3c94549174db6681fbd9f5184ba455f300341fa204142
+  metadata.gz: 3b58db094b64e706872768e27a2c92827d182f5cde938b974de333ad99c911e2
+  data.tar.gz: c6bd4169b99f66409c0bf8576e79bd34f567ed92e88c00abcfd4d8ce9a9d3f02
 SHA512:
-  metadata.gz: d8c1b2faa6c40c7f447d32a72240958d4098bc95b52150083009d38d65fd1e99488d77604eba4ae4b8d26bbd61ff9ddf264391aacec5b466e53dc1f79f33e523
-  data.tar.gz: c68d21caf7452690ed7107e7ee7f2650d33f6facc794396249e3ad9e14a75f1cb0a936b6bfb0f2e75b3082ca7ad57d172a139052f72a6de2e098e60405831b9e
+  metadata.gz: bbe1f3c052a2594c13c817e7fb06894b38582f4bde8656347eace28217ac349f689e4326fd3f5c941bf7075db3232c038b7ae47effdc80d0778a5304d978ae78
+  data.tar.gz: b2fae9dd53cf66ec159a2d67eec9d65432b47dcee687111295839755e3e69c05c5f40f2805cc47ed37096479004b7d59e9c3c6b5eb5d6c7d0217363a7ebdd29d

data/lib/active_record_shards/default_slave_patches.rb

@@ -100,7 +100,10 @@ module ActiveRecordShards
 
     module ActiveRelationPatches
       def self.included(base)
-        [:calculate, :exists?, :pluck, :find_with_associations].each do |m|
+        [
+          :calculate, :exists?, :pluck,
+          ActiveRecord::VERSION::MAJOR >= 4 ? :load : :find_with_associations
+        ].each do |m|
           ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, m)
         end
       end

data/lib/active_record_shards/migration.rb

@@ -1,25 +1,32 @@
 # frozen_string_literal: true
 module ActiveRecord
   class Migrator
-    class << self
-      [:up, :down, :run].each do |m|
-        define_method("#{m}_with_sharding") do |*args|
-          ActiveRecord::Base.on_shard(nil) do
-            send("#{m}_without_sharding", *args)
-          end
-          ActiveRecord::Base.on_all_shards do
-            send("#{m}_without_sharding", *args)
-          end
-        end
-        alias_method :"#{m}_without_sharding", m.to_sym
-        alias_method m.to_sym, :"#{m}_with_sharding"
+    def self.shards_migration_context
+      if ActiveRecord::VERSION::STRING >= '5.2.0'
+        ActiveRecord::MigrationContext.new(['db/migrate'])
+      else
+        self
       end
     end
 
+    def run_with_sharding
+      ActiveRecord::Base.on_shard(nil) { run_without_sharding }
+      ActiveRecord::Base.on_all_shards { run_without_sharding }
+    end
+    alias_method :run_without_sharding, :run
+    alias_method :run, :run_with_sharding
+
+    def migrate_with_sharding
+      ActiveRecord::Base.on_shard(nil) { migrate_without_sharding }
+      ActiveRecord::Base.on_all_shards { migrate_without_sharding }
+    end
+    alias_method :migrate_without_sharding, :migrate
+    alias_method :migrate, :migrate_with_sharding
+
     # don't allow Migrator class to cache versions
     undef migrated
     def migrated
-      self.class.get_all_versions
+      self.class.shards_migration_context.get_all_versions
     end
 
     # list of pending migrations is any migrations that haven't run on all shards.
@@ -38,7 +45,7 @@ module ActiveRecord
       missing = {}
 
       collect = lambda do |shard|
-        migrated = get_all_versions
+        migrated = shards_migration_context.get_all_versions
 
         p = versions - migrated
         pending[shard] = p if p.any?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.11.5
+  version: 3.12.0.beta1
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +21,7 @@ dependencies:
         version: 3.2.16
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: 3.2.16
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -41,7 +41,7 @@ dependencies:
         version: 3.2.16
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: 3.2.16
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
@@ -224,9 +224,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6