active_record_shards 5.3.1 → 5.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 032e2279ef2f82d2a1a30a171429a7b34b625766fe3a6060ad21141d551c0ca4
-  data.tar.gz: 169c3f8e0bf7d4f036a23106d8523b5e09756535f289be4da5ec295ec6c1605d
+  metadata.gz: e71e05125d6c15ad696e8243cb09234c09d29e1c381b47adeee2a81b0b79e188
+  data.tar.gz: f06e143aabfc0e14d3058e03acc367e54d0219bcbf9355df57ee33e174393dbf
 SHA512:
-  metadata.gz: c35a082c7b33926009467f10871177ecb02a2c5dc3b009a1f5d1a889fb49f039ea88bb931cdd80c7cc67763120158748610925ece6d53ee463020388a4690cc5
-  data.tar.gz: 4acc42ae93f573d60d12384f6f7454b4a85d1a5a13239491cb6b00a10d722dfb1534026119f845b3f8c39c5e0114500099eac6806cc2c8b6864c7c9f74835fde
+  metadata.gz: 60629cde5e087c941d9ce3d753a57c5d73f37cbd78d9e7b0f6f1d921834c25267371a0b2e957a92112eac3f295a837a2a41681cda63dc3a6bfd981811dfbcd91
+  data.tar.gz: 2c4e012130eead2088089cefb2204508141b3bd5056f733ccd26029fa053ae78b10b077750b64f5b364731b752842210086e368f813b3b1b333e9cdf2fecefb9

data/lib/active_record_shards/connection_switcher.rb

@@ -142,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
 
@@ -166,11 +162,19 @@ 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')
 

data/lib/active_record_shards/model.rb

@@ -11,17 +11,20 @@ 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?
+      return @_ars_model_is_sharded unless @_ars_model_is_sharded.nil?
+
+      @_ars_model_is_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
-          sharded != false
+          base_class.is_sharded?
         end
-      else
-        base_class.is_sharded?
-      end
     end
 
     def on_replica_by_default?

data/lib/active_record_shards.rb

@@ -18,12 +18,25 @@ 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
+
+  # Busts internal caches kept by active_record_shards, for things which are _supposed_ to be the
+  # same for the life of the process. You shouldn't need to call this unless you're doing something
+  # truly evil like changing RAILS_ENV after boot
+  def self.reset_app_env!
+    @app_env = nil
+    models = [ActiveRecord::Base] + ActiveRecord::Base.descendants
+    models.each do |model|
+      model.remove_instance_variable(:@_ars_model_is_sharded) if model.instance_variable_defined?(:@_ars_model_is_sharded)
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.3.3
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-14 00:00:00.000000000 Z
+date: 2023-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord