switchman 1.14.7 → 1.14.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7f92e216d9c343ff6d8ded7ea32629a86baeeca5af8daf39dcfd4a81dc1c6af
-  data.tar.gz: 13499b3453710700810e928e17a95a86bed24f93cd82a6eeacc57fd1032f2df9
+  metadata.gz: dab76e2ecd636e151a0cd1073bb2271fb54ed6051dbaecca170c89fb96de012c
+  data.tar.gz: f4537579439d2b6dc6ce8947edeaf80effb6af16eef20f13ef85b1e1803b80d9
 SHA512:
-  metadata.gz: 84bf01fe033e84e715066e087e4afe832c14acb291a2248f1697313e9123643671c226aa189c7cf44e8d9ddcd765c4f54f06ac2b4c03dba53cfbeaac148816d9
-  data.tar.gz: 23a24930bf9cf0e744d6b4c4661628af8acacf6945c768847723458278971427360eb00b3e1683c997a772f3e391857849611713685cb26e870c6d163f05bfd0
+  metadata.gz: a502e2f21fa54eeb1a04589ed5695b2077039ba011e2ee04fc322bfca0107ddf923b0863748c6ab08a35cc910e7f5b880d052acbddaee75149fc031e8fd0fcbd
+  data.tar.gz: 66bb964e5622bf09aecee7a9f5404056185427468634f18001d0fae2dc188d119232f15ad7d2d7b071de7e86e0a4b0a80e8394ce4eafa5b3c571821c7b42cfa1

data/app/models/switchman/shard_internal.rb

@@ -64,7 +64,7 @@ module Switchman
           end
 
           # rebuild current shard activations - it might have "another" default shard serialized there
-          active_shards.replace(active_shards.map do |category, shard|
+          active_shards.replace(active_shards.dup.map do |category, shard|
             shard = Shard.lookup((!shard || shard.default?) ? 'default' : shard.id)
             [category, shard]
           end.to_h)

data/lib/switchman/active_record/association.rb

@@ -88,7 +88,11 @@ module Switchman
           # Copypasta from Activerecord but with added global_id_for goodness.
           def records_for(ids)
             scope.where(association_key_name => ids).load do |record|
-              global_key = Shard.global_id_for(record[association_key_name], record.shard)
+              global_key = if record.class.shard_category == :unsharded
+                             convert_key(record[association_key_name])
+                           else
+                             Shard.global_id_for(record[association_key_name], record.shard)
+                           end
               owner = owners_by_key[global_key.to_s].first
               association = owner.association(reflection.name)
               association.set_inverse_instance(record)

data/lib/switchman/active_record/base.rb

@@ -68,6 +68,14 @@ module Switchman
             result
           end
         end
+
+        def clear_query_caches_for_current_thread
+          ::ActiveRecord::Base.connection_handlers.each_value do |handler|
+            handler.connection_pool_list.each do |pool|
+              pool.connection(switch_shard: false).clear_query_cache if pool.active_connection?
+            end
+          end
+        end
       end
 
       def self.included(klass)

data/lib/switchman/active_record/connection_pool.rb

@@ -32,10 +32,10 @@ module Switchman
         conn
       end
 
-      def connection
-        conn = super
+      def connection(switch_shard: true)
+        conn = super()
         raise NonExistentShardError if shard.new_record?
-        switch_database(conn) if conn.shard != self.shard
+        switch_database(conn) if conn.shard != self.shard && switch_shard
         conn
       end
 

data/lib/switchman/connection_pool_proxy.rb

@@ -53,10 +53,10 @@ module Switchman
       connection_pools.map(&:connections).inject([], &:+)
     end
 
-    def connection
+    def connection(switch_shard: true)
       pool = current_pool
       begin
-        connection = pool.connection
+        connection = pool.connection(switch_shard: switch_shard)
         connection.instance_variable_set(:@schema_cache, @schema_cache) unless ::Rails.version >= '6'
         connection
       rescue ConnectionError

data/lib/switchman/default_shard.rb

@@ -3,6 +3,7 @@ require 'switchman/database_server'
 module Switchman
   class DefaultShard
     def id; 'default'; end
+    alias cache_key id
     def activate(*categories); yield; end
     def activate!(*categories); end
     def default?; true; end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.14.7"
+  VERSION = "1.14.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.14.7
+  version: 1.14.8
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties