active_record_shards 5.3.0 → 5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71d3927981244ea33e21fd09e315e4beef0427eb4dae56011484626ffb224346
-  data.tar.gz: 5596dbc4576f6cd9cd6ad3e1547ab8ff07d5fb33d3ee0688495fac14a0c50343
+  metadata.gz: 3d54a5e8446f89d23e9c302763e48033f2398a72495d150772ea4bc3ec4fe575
+  data.tar.gz: 9add02d3fec821e54c6f388a021cb09f69320de09846242e49fa2f26269ce948
 SHA512:
-  metadata.gz: f6b430fc35baf8da887402d75e906cae36c2272e5e76076ee553f833423caf4059089298e2b4b002e826d99287fa5f31f69e9ed3d580370f1a9900c6dd0019de
-  data.tar.gz: f5bf02670f7ace64c734d3a5ef8e008395067b23451b61ea55a2bfb2b207c4ea20bc5225d7dd8230bbd73b223639079bdf3e0e7267ff1d94636cf6dc68702d48
+  metadata.gz: 27627d24f879c675af2d414c334fd713f9845f2e7d93dd8e6c580194357bba038f5c1ded593be06702a570e7631beeb92e5c2be8e26d8629b5ef84b3333e4b47
+  data.tar.gz: d47b1b6906e5ff40633ebe6128fdc845cac7b81d377a16fd31ece96398a174fe87f8bd2a33406abe3516f53969ab5c910e163a792fb0f93e2e6119c8dfc15267

data/lib/active_record_shards/connection_switcher.rb

@@ -4,6 +4,8 @@ require 'active_record_shards/shard_support'
 
 module ActiveRecordShards
   module ConnectionSwitcher
+    class LegacyConnectionHandlingError < StandardError; end
+
     case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
     when '6.1', '7.0'
       SHARD_NAMES_CONFIG_KEY = :shard_names
@@ -140,10 +142,6 @@ module ActiveRecordShards
     end
 
     def shard_names
-      unless config_for_env.fetch(SHARD_NAMES_CONFIG_KEY, []).all? { |shard_name| shard_name.is_a?(Integer) }
-        raise "All shard names must be integers: #{config_for_env[SHARD_NAMES_CONFIG_KEY].inspect}."
-      end
-
       config_for_env[SHARD_NAMES_CONFIG_KEY] || []
     end
 
@@ -164,12 +162,22 @@ module ActiveRecordShards
           raise "Did not find #{shard_env} in configurations, did you forget to add it to your database config? (configurations: #{configurations.to_h.keys.inspect})"
         end
 
+        ensure_all_shard_names_are_integers(config)
+
         config
       end
     end
     alias_method :check_config_for_env, :config_for_env
 
+    def ensure_all_shard_names_are_integers(config)
+      unless config.fetch(SHARD_NAMES_CONFIG_KEY, []).all? { |shard_name| shard_name.is_a?(Integer) }
+        raise "All shard names must be integers: #{config.inspect}."
+      end
+    end
+
     def switch_connection(options)
+      ensure_legacy_connection_handling if ActiveRecord.version >= Gem::Version.new('6.1')
+
       if options.any?
         if options.key?(:replica)
           current_shard_selection.on_replica = options[:replica]
@@ -185,6 +193,22 @@ module ActiveRecordShards
       end
     end
 
+    def ensure_legacy_connection_handling
+      unless legacy_connection_handling_owner.legacy_connection_handling
+        raise LegacyConnectionHandlingError, "ActiveRecordShards is _only_ compatible with ActiveRecord `legacy_connection_handling` set to `true`."
+      end
+    end
+
+    def legacy_connection_handling_owner
+      @legacy_connection_handling_owner ||=
+        case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
+        when '7.0'
+          ActiveRecord
+        when '6.1'
+          ActiveRecord::Base
+        end
+    end
+
     def shard_env
       ActiveRecordShards.app_env
     end

data/lib/active_record_shards/model.rb

@@ -11,17 +11,26 @@ module ActiveRecordShards
     end
 
     def is_sharded? # rubocop:disable Naming/PredicateName
-      if self == ActiveRecord::Base
-        sharded != false && supports_sharding?
-      elsif self == base_class
-        if sharded.nil?
-          ActiveRecord::Base.is_sharded?
-        else
-          sharded != false
-        end
-      else
-        base_class.is_sharded?
-      end
+      # "sharded" here means self.sharded, but actually writing "self.sharded"
+      # doesn't work until Ruby 2.7 (and this gem currently supports 2.6) because
+      # the sharded attr_accessor is private. Private methods must be called without
+      # a receiver, but Ruby 2.7+ does allow an explicit "self" as a receiver.
+      return sharded unless sharded.nil?
+
+      # Despite self.sharded not working, self.sharded= _DOES_ work. That's an exception
+      # to the "private methods must be called with no receiver" rule (presumably
+      # because it would otherwise be ambiguous with local variable assignment).
+      self.sharded = if self == ActiveRecord::Base
+                       sharded != false && supports_sharding?
+                     elsif self == base_class
+                       if sharded.nil?
+                         ActiveRecord::Base.is_sharded?
+                       else
+                         sharded != false
+                       end
+                     else
+                       base_class.is_sharded?
+                     end
     end
 
     def on_replica_by_default?

data/lib/active_record_shards.rb

@@ -18,12 +18,14 @@ module ActiveRecordShards
   end
 
   def self.app_env
-    env = Rails.env if defined?(Rails.env)
-    env ||= RAILS_ENV if Object.const_defined?(:RAILS_ENV)
-    env ||= ENV['RAILS_ENV']
-    env ||= APP_ENV if Object.const_defined?(:APP_ENV)
-    env ||= ENV['APP_ENV']
-    env || 'development'
+    @app_env ||= begin
+      env = Rails.env if defined?(Rails.env)
+      env ||= RAILS_ENV if Object.const_defined?(:RAILS_ENV)
+      env ||= ENV['RAILS_ENV']
+      env ||= APP_ENV if Object.const_defined?(:APP_ENV)
+      env ||= ENV['APP_ENV']
+      env || 'development'
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.2
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 2023-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -97,20 +97,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement