switchman 4.3.5 → 4.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 756e8de301a68ac11f33a55bf4686cfa5deb9ff15f40b8750a9ec9ade881e136
-  data.tar.gz: 347370745f986e5b63bcc2c11c8855d5ca1a9c08d79e0f8b66d60552b0cbaa1b
+  metadata.gz: 2006f24bb61000cf22294395b7597c5551a56600b7c1b1fea0923f3d94e498e3
+  data.tar.gz: 30818e17d6547d86d46936e01c2df78118bbf992667cd1614c69bab9e173211c
 SHA512:
-  metadata.gz: 6f50f01e9566f118a4bbc89a4aa30fabc8ed00d34fc020c84856ab5c027aa912b57462c7a5658f7b330eaed4308d121703266f441b9b1e451dcf4a2bf3e8ee3e
-  data.tar.gz: 3146ef11b0fa04471c63c0bc74bb4344d15fc08a833bfbd878a5be82cfd024a2f6c2516bef2961e8032164f16db367c2b96aaf421032d2b7e10b4a3e599b00eb
+  metadata.gz: 110c91ddc723bde6ec5cbacbb992a67d87da0880fca81e22ff1b3c8d7852b0a53bc3024501c9eaae3c7a5f355615a5f6d880faf4fd5ace003adc148bcb14d3a8
+  data.tar.gz: '08a4458dcd9fa616e9079bd98f3609c42fa397941426c69725d517018c19b3e88dd952702c9bd7870112e8210fb85d94c8d6f706199aac1554c371e1f46b6f29'

data/db/migrate/20130328212039_create_switchman_shards.rb

@@ -2,7 +2,7 @@
 
 class CreateSwitchmanShards < ActiveRecord::Migration[4.2]
   def change
-    create_table :switchman_shards do |t|
+    create_table :switchman_shards do |t| # rubocop:disable Rails/CreateTableWithTimestamps -- added in a subsequent migration
       t.string :name
       t.string :database_server_id
       t.boolean :default, default: false, null: false

data/db/migrate/20180828183945_add_default_shard_index.rb

@@ -2,8 +2,8 @@
 
 class AddDefaultShardIndex < ActiveRecord::Migration[4.2]
   def change
-    Switchman::Shard.where(default: nil).update_all(default: false) if Switchman::Shard.current.default?
-    change_column_default :switchman_shards, :default, false
+    Switchman::Shard.where(default: nil).update_all(default: false) if Switchman::Shard.current.default? # rubocop:disable Rails/SkipsModelValidations
+    change_column_default :switchman_shards, :default, from: nil, to: false
     change_column_null :switchman_shards, :default, false
     options = if connection.adapter_name == "PostgreSQL"
                 { unique: true, where: '"default"' }

data/db/migrate/20180828192111_add_timestamps_to_shards.rb

@@ -6,7 +6,7 @@ class AddTimestampsToShards < ActiveRecord::Migration[4.2]
   def change
     add_timestamps :switchman_shards, null: true, if_not_exists: true
     now = Time.now.utc
-    Switchman::Shard.update_all(updated_at: now, created_at: now) if Switchman::Shard.current.default?
+    Switchman::Shard.update_all(updated_at: now, created_at: now) if Switchman::Shard.current.default? # rubocop:disable Rails/SkipsModelValidations
     change_column_null :switchman_shards, :updated_at, false
     change_column_null :switchman_shards, :created_at, false
 

data/lib/switchman/active_record/abstract_adapter.rb

@@ -22,7 +22,7 @@ module Switchman
 
         @instrumenter = Switchman::ShardedInstrumenter.new(@instrumenter, self) if ::Rails.version < "8.0"
 
-        @last_query_at = Time.now
+        @last_query_at = Time.zone.now
       end
 
       if ::Rails.version >= "8.0"
@@ -40,7 +40,7 @@ module Switchman
       def log(...)
         super
       ensure
-        @last_query_at = Time.now
+        @last_query_at = Time.zone.now
       end
     end
   end

data/lib/switchman/active_record/attribute_methods.rb

@@ -27,6 +27,11 @@ module Switchman
 
         def define_attribute_methods
           result = super
+          # ActiveRecord::Core#init_internals calls this for every record it instantiates,
+          # and AR returns false once the methods have already been generated. Our class_evals
+          # below are just as redundant in that case, so don't pay for them per-record.
+          return result unless result
+
           # ensure that we're using the sharded attribute method
           # and not the silly one in AR::AttributeMethods::PrimaryKey
           return result unless sharded_column?(@primary_key)

data/lib/switchman/active_record/base.rb

@@ -190,7 +190,7 @@ module Switchman
                                end
         end
         target_shard.activate do
-          self.class.upsert_all([shadow_attrs], unique_by: self.class.primary_key)
+          self.class.upsert_all([shadow_attrs], unique_by: self.class.primary_key) # rubocop:disable Rails/SkipsModelValidations
         end
       end
 
@@ -205,7 +205,7 @@ module Switchman
         Array(target_shards).each do |target_shard|
           next if target_shard == shard
 
-          target_shard.activate { self.class.where("id = ?", global_id).delete_all }
+          self.class.shard(target_shard).where(id: global_id).delete_all
         end
       end
 

data/lib/switchman/active_record/calculations.rb

@@ -83,7 +83,7 @@ module Switchman
           if opts[:association]
             key_ids     = calculated_data.collect { |row| row[opts[:group_aliases].first] }
             key_records = opts[:association].klass.base_class.where(id: key_ids)
-            key_records = key_records.to_h { |r| [Shard.relative_id_for(r, shard, target_shard), r] }
+            key_records = key_records.index_by { |r| Shard.relative_id_for(r, shard, target_shard) }
           end
 
           calculated_data.map do |row|

data/lib/switchman/active_record/finder_methods.rb

@@ -46,7 +46,7 @@ module Switchman
         return false if @none
 
         if Base === conditions
-          raise ArgumentError, <<-TEXT.squish
+          raise ArgumentError, <<~TEXT.squish
             You are passing an instance of ActiveRecord::Base to `exists?`.
             Please pass the id of the object by calling `.id`.
           TEXT

data/lib/switchman/active_record/pending_migration_connection.rb

@@ -4,13 +4,7 @@ module Switchman
   module ActiveRecord
     module PendingMigrationConnection
       module ClassMethods
-        def current_role
-          ::ActiveRecord::Base.current_role
-        end
-
-        def current_switchman_shard
-          ::ActiveRecord::Base.current_switchman_shard
-        end
+        delegate :current_role, :current_switchman_shard, to: :"::ActiveRecord::Base"
       end
     end
   end

data/lib/switchman/active_record/postgresql_adapter.rb

@@ -94,9 +94,7 @@ module Switchman
         end
       end
 
-      def quote_local_table_name(name)
-        self.class.quote_local_table_name(name)
-      end
+      delegate :quote_local_table_name, to: :class
 
       def quote_table_name(name)
         self.class.quote_table_name(name, shard: @use_local_table_name ? nil : shard)

data/lib/switchman/active_record/query_methods.rb

@@ -5,9 +5,7 @@ module Switchman
     module QueryMethods
       # Use this class to prevent a value from getting transposed across shards
       class NonTransposingValue < SimpleDelegator
-        def class
-          __getobj__.class
-        end
+        delegate :class, to: :__getobj__
 
         def is_a?(other)
           return true if other == NonTransposingValue

data/lib/switchman/active_record/test_fixtures.rb

@@ -18,7 +18,7 @@ module Switchman
               spec_name = (payload[:connection_name] if payload.key?(:connection_name))
               shard = payload[:shard] if payload.key?(:shard)
 
-              if spec_name && !FORBIDDEN_DB_ENVS.include?(shard)
+              if spec_name && FORBIDDEN_DB_ENVS.exclude?(shard)
                 begin
                   connection = ::ActiveRecord::Base.connection_handler.retrieve_connection(spec_name, shard:)
                   connection.connect! # eagerly validate the connection
@@ -69,7 +69,7 @@ module Switchman
             shard = payload[:shard] if payload.key?(:shard)
 
             # INST: filter by FORBIDDEN_DB_ENVS
-            if connection_name && !FORBIDDEN_DB_ENVS.include?(shard)
+            if connection_name && FORBIDDEN_DB_ENVS.exclude?(shard)
               pool = ::ActiveRecord::Base.connection_handler.retrieve_connection_pool(connection_name, shard:)
               if pool
                 setup_shared_connection_pool

data/lib/switchman/active_support/cache.rb

@@ -24,12 +24,11 @@ module Switchman
           store = super
           # must use the string name, otherwise it will try to auto-load the constant
           # and we don't want to require redis in this file (since it's not a hard dependency)
-          # rubocop:disable Style/ClassEqualityComparison
+          # rubocop:disable-next Style/ClassEqualityComparison
           if store.class.name == "ActiveSupport::Cache::RedisCacheStore" &&
              !(::ActiveSupport::Cache::RedisCacheStore <= RedisCacheStore)
             ::ActiveSupport::Cache::RedisCacheStore.prepend(RedisCacheStore)
           end
-          # rubocop:enable Style/ClassEqualityComparison
           store.options[:namespace] ||= -> { Shard.current.default? ? nil : "shard_#{Shard.current.id}" }
           store
         end

data/lib/switchman/database_server.rb

@@ -68,7 +68,7 @@ module Switchman
       end
 
       def database_servers
-        if !@database_servers || @database_servers.empty?
+        if @database_servers.blank?
           @database_servers = {}.with_indifferent_access
           roles = []
           ::ActiveRecord::Base.configurations.configurations.each do |config|

data/lib/switchman/engine.rb

@@ -48,15 +48,6 @@ module Switchman
         ::ActiveRecord::ConnectionAdapters::ConnectionHandler.prepend(ActiveRecord::ConnectionHandler)
         ::ActiveRecord::ConnectionAdapters::ConnectionPool.prepend(ActiveRecord::ConnectionPool)
         ::ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(ActiveRecord::QueryCache)
-        ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(ActiveRecord::PostgreSQLAdapter)
-        # https://github.com/rails/rails/commit/0016280f4fde55d96738887093dc333aae0d107b
-        if ::Rails.version < "7.2"
-          ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(ActiveRecord::PostgreSQLAdapter::ClassMethods)
-        else
-          ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.singleton_class.prepend(
-            ActiveRecord::PostgreSQLAdapter::ClassMethods
-          )
-        end
 
         ::ActiveRecord::DatabaseConfigurations.prepend(ActiveRecord::DatabaseConfigurations)
         ::ActiveRecord::DatabaseConfigurations::DatabaseConfig.prepend(
@@ -93,8 +84,6 @@ module Switchman
 
         ::ActiveRecord::Tasks::DatabaseTasks.singleton_class.prepend(ActiveRecord::Tasks::DatabaseTasks)
 
-        ::ActiveRecord::TestFixtures.prepend(ActiveRecord::TestFixtures)
-
         ::ActiveRecord::TypeCaster::Map.include(ActiveRecord::TypeCaster::Map)
         ::ActiveRecord::TypeCaster::Connection.include(ActiveRecord::TypeCaster::Connection)
 
@@ -107,6 +96,19 @@ module Switchman
 
         ::ActiveRecord::ConnectionAdapters::TableDefinition.prepend(ActiveRecord::TableDefinition)
       end
+
+      ::ActiveSupport.on_load(:active_record_postgresqladapter) do
+        prepend ActiveRecord::PostgreSQLAdapter
+
+        # https://github.com/rails/rails/commit/0016280f4fde55d96738887093dc333aae0d107b
+        if ::Rails.version < "7.2"
+          prepend(ActiveRecord::PostgreSQLAdapter::ClassMethods)
+        else
+          singleton_class.prepend(ActiveRecord::PostgreSQLAdapter::ClassMethods)
+        end
+      end
+
+      ::ActiveSupport.on_load(:active_record_fixtures) { prepend ActiveRecord::TestFixtures }
       # Ensure that ActiveRecord::Base is always loaded before any app-level
       # initializers can go try to load Switchman::Shard or we get a loop
       ::ActiveRecord::Base
@@ -126,7 +128,7 @@ module Switchman
       # initialize_cache initializer, but for each value in the map, rather
       # than just Rails.cache. if config.cache_store is a flat value, uses it
       # to fill just the Rails.env entry in the cache map.
-      unless Switchman.config[:cache_map].present?
+      if Switchman.config[:cache_map].blank?
         cache_store_config = ::Rails.configuration.cache_store
         cache_store_config = { ::Rails.env => cache_store_config } unless cache_store_config.is_a?(Hash)
 
@@ -158,7 +160,7 @@ module Switchman
       ::Rails.singleton_class.prepend(Rails::ClassMethods)
 
       ::ActiveSupport.on_load(:action_controller) do
-        ::ActionController::Base.include(ActionController::Caching)
+        include ActionController::Caching
       end
     end
   end

data/lib/switchman/parallel.rb

@@ -20,9 +20,7 @@ module Switchman
         @wrapper = wrapper
       end
 
-      def exception
-        @wrapper.exception
-      end
+      delegate :exception, to: :@wrapper
     end
 
     class UndumpableResult

data/lib/switchman/r_spec_helper.rb

@@ -17,6 +17,7 @@ module Switchman
       klass.parent_groups.any? { |group| group.included_modules.include?(self) }
     end
 
+    # rubocop:disable-next Rails/Output
     def self.included(klass)
       # our before handlers have already been configured from a parent group; don't add them again
       parent_group = klass.parent_groups[1]
@@ -85,7 +86,7 @@ module Switchman
             @@shard2.destroy
           end
           @@shard2.database_server.destroy
-          exit status if status
+          exit status if status # rubocop:disable Rails/Exit
         end
       end
 

data/lib/switchman/shard.rb

@@ -5,10 +5,8 @@ module Switchman
     # ten trillion possible ids per shard. yup.
     IDS_PER_SHARD = 10_000_000_000_000
 
-    # rubocop:disable Style/SymbolProc -- transforming to a lambda produces "no receiver given"
     # only allow one default
     validates_uniqueness_of :default, if: ->(s) { s.default? }
-    # rubocop:enable Style/SymbolProc
 
     after_save :clear_cache
     after_destroy :clear_cache
@@ -79,7 +77,7 @@ module Switchman
 
           # Now find the actual record, if it exists
           @default = begin
-            find_cached("default_shard") { Shard.where(default: true).take } || default
+            find_cached("default_shard") { Shard.find_by(default: true) } || default
           rescue
             default
           end
@@ -215,8 +213,8 @@ module Switchman
             # nothing to do
             return if database_servers.none?
 
-            scopes = database_servers.to_h do |server|
-              [server, scope.merge(server.shards)]
+            scopes = database_servers.index_with do |server|
+              scope.merge(server.shards)
             end
           else
             scopes = scope.group_by(&:database_server)
@@ -665,9 +663,7 @@ module Switchman
     end
 
     # skip global_id.hash
-    def hash
-      id.hash
-    end
+    delegate :hash, to: :id
 
     def destroy
       raise("Cannot destroy the default shard") if default?
@@ -696,8 +692,8 @@ module Switchman
       if classes.empty?
         { ::ActiveRecord::Base => self }
       else
-        classes.to_h do |klass|
-          [klass, self]
+        classes.index_with do
+          self
         end
       end
     end

data/lib/switchman/unsharded_record.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Switchman
-  class UnshardedRecord < ::ActiveRecord::Base
+  class UnshardedRecord < ::ActiveRecord::Base # rubocop:disable Rails/ApplicationRecord
     self.abstract_class = true
   end
 end

data/lib/switchman/version.rb

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

data/lib/switchman.rb

@@ -39,7 +39,7 @@ module Switchman
     def foreign_key_check(name, type, limit: nil)
       return unless name.to_s.end_with?("_id") && type.to_s == "integer" && limit.to_i < 8
 
-      puts <<~TEXT.squish
+      warn <<~TEXT.squish
         WARNING: All foreign keys need to be 8-byte integers.
         #{name} looks like a foreign key.
         If so, please add the option: `:limit => 8`

data/lib/tasks/switchman.rake

@@ -243,7 +243,7 @@ module Switchman
       scope = scope.where(positive_query, *conditions) unless positive_queries.empty?
 
       scope = scope.where("NOT (#{negative_ranges.join(" OR")})") unless negative_ranges.empty?
-      scope = scope.where("id NOT IN (?)", negative_shard_ids) unless negative_shard_ids.empty?
+      scope = scope.where.not(id: negative_shard_ids) unless negative_shard_ids.empty?
       scope
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 4.3.5
+  version: 4.3.6
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-01 00:00:00.000000000 Z
+date: 2026-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord