switchman 4.2.0 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfb4e89f881628a5d90c8f309ddf587fdc5bfebe5bc7985c79fea9dd06e7168c
-  data.tar.gz: baa3202cd9fb68347d71d43adecdbe3124fe3f4f604558f92546e8fa5c5b4773
+  metadata.gz: 631d6e59b4e4f67ba719a92371f020bc3b39ca8fd8501344b469194f7b6e6d66
+  data.tar.gz: 888809fc92e8489f578c72fe685d811108f8f268cc0309f559837f9f36c4139a
 SHA512:
-  metadata.gz: c351d3ff898e668ac7a8c8ab40e9cf2249f428a2d2bbc9a16573334e1599cb9bcac20a47a3534e70b7900fd76ca55f6f4a8625c9dc7c8bb3ef1b4ade95a17ff3
-  data.tar.gz: e3205573c3bbf8d8bf8a1e87beaaaed1adc2dba268f53ec1bac8c870f29f51ecdce923028eaa8528cffb9250965fc7b72d8d2dce4882c63edb0ad0d66d624a57
+  metadata.gz: 3eaeb2a4153632f20cba6ad4fbe4810b64c946a5db7596a22ab9e17303ec5a2d36add1e5114e7ca5af94c53e7b9f25d10cec2631a5f8b586d5a1bff670546a7a
+  data.tar.gz: 3ce30e552e0293f3541046a23a0aaf732001dc910b2ab5e8dd928a5c5edfdc0c504ca23b432807895c0a42ed1cb2e4a95029aa465d6f5dae0052e774d18df6ac

data/lib/switchman/active_record/abstract_adapter.rb

@@ -19,10 +19,18 @@ module Switchman
 
       def initialize(*args)
         super
-        @instrumenter = Switchman::ShardedInstrumenter.new(@instrumenter, self)
+
+        @instrumenter = Switchman::ShardedInstrumenter.new(@instrumenter, self) if ::Rails.version < "8.0"
+
         @last_query_at = Time.now
       end
 
+      if ::Rails.version >= "8.0"
+        def instrumenter # :nodoc:
+          @instrumenter ||= Switchman::ShardedInstrumenter.new(::ActiveSupport::Notifications.instrumenter, self)
+        end
+      end
+
       def quote_local_table_name(name)
         quote_table_name(name)
       end

data/lib/switchman/active_record/calculations.rb

@@ -31,7 +31,7 @@ module Switchman
         if operation == "average"
           result = calculate_simple_average(column_name, distinct)
         else
-          result = activate do |relation|
+          result = activate(count: operation == "count") do |relation|
             relation.call_super(:execute_simple_calculation, Calculations, operation, column_name, distinct)
           end
           if result.is_a?(Array)

data/lib/switchman/active_record/relation.rb

@@ -163,7 +163,7 @@ module Switchman
         end
       end
 
-      def activate(unordered: false, &block)
+      def activate(count: false, unordered: false, &block)
         shards = all_shards
         if Array === shards && shards.length == 1
           if !loaded? && shard_value != shards.first
@@ -189,7 +189,13 @@ module Switchman
 
             shard_results = relation.activate(&block)
 
-            if shard_results.present? && !unordered
+            if shard_results.present? && count
+              unless shard_results.is_a?(Integer)
+                raise "expected integer result for count, got #{shard_results.class.name}"
+              end
+
+              result_count += shard_results
+            elsif shard_results.present? && !unordered
               can_order ||= can_order_cross_shard_results? unless order_values.empty?
               raise OrderOnMultiShardQuery if !can_order && !order_values.empty? && result_count.positive?
 

data/lib/switchman/active_record/test_fixtures.rb

@@ -20,7 +20,7 @@ module Switchman
 
               if spec_name && !FORBIDDEN_DB_ENVS.include?(shard)
                 begin
-                  connection = ::ActiveRecord::Base.connection_handler.retrieve_connection(spec_name, shard: shard)
+                  connection = ::ActiveRecord::Base.connection_handler.retrieve_connection(spec_name, shard:)
                   connection.connect! # eagerly validate the connection
                 rescue ::ActiveRecord::ConnectionNotEstablished
                   connection = nil
@@ -70,7 +70,7 @@ module Switchman
 
             # INST: filter by FORBIDDEN_DB_ENVS
             if connection_name && !FORBIDDEN_DB_ENVS.include?(shard)
-              pool = ::ActiveRecord::Base.connection_handler.retrieve_connection_pool(connection_name, shard: shard)
+              pool = ::ActiveRecord::Base.connection_handler.retrieve_connection_pool(connection_name, shard:)
               if pool
                 setup_shared_connection_pool
 

data/lib/switchman/shard.rb

@@ -204,7 +204,7 @@ module Switchman
             database_servers = scope.reorder("database_server_id").select(:database_server_id).distinct
                                     .filter_map(&:database_server).uniq
             # nothing to do
-            return if database_servers.count.zero?
+            return if database_servers.none?
 
             scopes = database_servers.to_h do |server|
               [server, scope.merge(server.shards)]

data/lib/switchman/sharded_instrumenter.rb

@@ -13,10 +13,16 @@ module Switchman
       # when we might be doing a query while defining attribute methods,
       # so just avoid logging then
       if shard.is_a?(Shard) && Shard.instance_variable_get(:@attribute_methods_generated)
+        env = if ::Rails.version < "8.0"
+                @shard_host.pool.connection_class&.current_role
+              else
+                @shard_host.pool.connection_descriptor.name.constantize&.current_role
+              end
+
         payload[:shard] = {
           database_server_id: shard.database_server.id,
           id: shard.id,
-          env: @shard_host.pool.connection_class&.current_role
+          env:
         }
       end
       super

data/lib/switchman/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.2
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-25 00:00:00.000000000 Z
+date: 2025-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -80,160 +80,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '8.1'
-- !ruby/object:Gem::Dependency
-  name: debug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: rubocop-inst
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.29'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.29'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.15'
 description: Sharding
 email:
 - cody@instructure.com