switchman 3.6.1 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30e02a7b02e23693a5bab2272c0d51d452ca8f22aac18bf869c68280a002a333
-  data.tar.gz: c6e252c1c8fae37d78d801f446ebb6ddeb83c82b89690eda4bff7f8157e93c07
+  metadata.gz: 8a34057337ce5a3a1ded4a6964c52d777c561b44af92c15bb50d3f4a83f92cdc
+  data.tar.gz: d4c840584fa965c7e46ac378a17135e024f99c7e9ee30f1448a75e83721860ad
 SHA512:
-  metadata.gz: 2ad549fbd26947a8ae1fc61e966741d1541b767429be8f4c3c57b1955390bbab2481629e88450ad31ea6d8ae219801713740841c70a07283028c7ccbcfd60caf
-  data.tar.gz: 9f2481438cdc6d232e758174f405aeb641c1d02467172679cd2cb72ea4cd18569c0a00c626e9514de4dadd76cca2cc7c72dd80e28287e60e9bdd2c2632360021
+  metadata.gz: 3dc282c71808ca9bbac544773d8025d0e46fa0777de110f5c1b6957622022fdf43e7d5b148abc07b6176b5043008af85dc49bd58ca2e4a6960a42954bbddf49b
+  data.tar.gz: 7455c67b0d20e635295f5ce3f6d839019f00bae14d2f03ded1e0a0572c22e270e6793bd113f0fc9644621e5c62ae6c7ae546ec92deadc1d7a7b8d363cb34bef1

data/lib/switchman/active_record/base.rb

@@ -153,8 +153,8 @@ module Switchman
 
       def self.prepended(klass)
         klass.singleton_class.prepend(ClassMethods)
-        klass.scope :non_shadow, ->(key = primary_key) { where("#{key}<=? AND #{key}>?", Shard::IDS_PER_SHARD, 0) }
-        klass.scope :shadow, ->(key = primary_key) { where("#{key}>?", Shard::IDS_PER_SHARD) }
+        klass.scope :non_shadow, ->(key = primary_key) { where(key => 0..Shard::IDS_PER_SHARD) }
+        klass.scope :shadow, ->(key = primary_key) { where(key => Shard::IDS_PER_SHARD..) }
       end
 
       def _run_initialize_callbacks

data/lib/switchman/active_record/pending_migration_connection.rb

@@ -3,8 +3,14 @@
 module Switchman
   module ActiveRecord
     module PendingMigrationConnection
-      def self.current_switchman_shard
-        ::ActiveRecord::Base.current_switchman_shard
+      module ClassMethods
+        def current_role
+          ::ActiveRecord::Base.current_role
+        end
+
+        def current_switchman_shard
+          ::ActiveRecord::Base.current_switchman_shard
+        end
       end
     end
   end

data/lib/switchman/active_record/relation.rb

@@ -50,8 +50,8 @@ module Switchman
         end
       end
 
-      def explain
-        activate { |relation| relation.call_super(:explain, Relation) }
+      def explain(*args)
+        activate { |relation| relation.call_super(:explain, Relation, *args) }
       end
 
       def load(&block)

data/lib/switchman/engine.rb

@@ -79,7 +79,8 @@ module Switchman
         ::ActiveRecord::Migrator.prepend(ActiveRecord::Migrator)
 
         if ::Rails.version > "7.1.3"
-          ::ActiveRecord::PendingMigrationConnection.include(ActiveRecord::PendingMigrationConnection)
+          ::ActiveRecord::PendingMigrationConnection.singleton_class
+                                                    .include(ActiveRecord::PendingMigrationConnection::ClassMethods)
         end
 
         ::ActiveRecord::Reflection::AbstractReflection.include(ActiveRecord::Reflection::AbstractReflection)

data/lib/switchman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Switchman
-  VERSION = "3.6.1"
+  VERSION = "3.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.3
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-21 00:00:00.000000000 Z
+date: 2024-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord