switchman 3.3.4 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dfbc3eb712e4dabeaf71e1772014d3fcc50f439d7266c03943050e4054791f2
-  data.tar.gz: 902b59d7077cab4e9c583b55e5f1c3e4df6565e678b806f7df4515033031ea65
+  metadata.gz: a0e25e9a338b74ed4340f605d27978bba42bd45ef47ddac2bf7c44047db8a014
+  data.tar.gz: a6f6cdb8f1686213391d38f1eb172fefa9346012f3ce055b152696f1dcd05975
 SHA512:
-  metadata.gz: cba1cdfe3b5297443fe62064db702a3164fab8939497196e2c325e3a28fb6c4d1bbbd64698dd7c861c7f60b32eb5d91d6c1273ec4f8d3eafe45f675f5fcc36b1
-  data.tar.gz: b66c46f377262622339d18bd5167c6fca048b02e8167f9636aefae642afca1987ec51c71ed68a4fb3177fd0176c589b4f587c3336cc863f4b3478ed25503af53
+  metadata.gz: fe38ed259e6d881d9f60ecd0dd96b65a3dd154b750beb3b5ee5b8af03e7683f056238feb464fc32c5156841b439200c6ff0c9bf5959dc108b5bb91c298bd450a
+  data.tar.gz: b74decf8b11511749f80ffc792b2a98dbf6cdf36670d1f2db84a80975138aee8f0f4c11dab8883b9be93413324fb7f574589d6788781cd8e664dea34fe964cbd

data/lib/switchman/active_record/connection_pool.rb

@@ -12,8 +12,10 @@ module Switchman
 
       # rubocop:disable Naming/AccessorMethodName override method
       def set_schema_cache(cache)
+        schema_cache = get_schema_cache(cache.connection)
+
         cache.instance_variables.each do |x|
-          self.schema_cache.instance_variable_set(x, cache.instance_variable_get(x))
+          schema_cache.instance_variable_set(x, cache.instance_variable_get(x))
         end
       end
       # rubocop:enable Naming/AccessorMethodName override method

data/lib/switchman/database_server.rb

@@ -221,12 +221,12 @@ module Switchman
 
           unless schema == false
             shard.activate do
-              reset_column_information
-
-              ::ActiveRecord::Base.connection.transaction(requires_new: true) do
-                ::ActiveRecord::Base.connection.migration_context.migrate
+              with_empty_caches do
+                ::ActiveRecord::Base.connection.transaction(requires_new: true) do
+                  ::ActiveRecord::Base.connection.migration_context.migrate
+                end
               end
-              reset_column_information
+
               ::ActiveRecord::Base.descendants.reject do |m|
                 m <= UnshardedRecord || !m.table_exists?
               end.each(&:define_attribute_methods)
@@ -278,5 +278,20 @@ module Switchman
     def reset_column_information
       ::ActiveRecord::Base.descendants.reject { |m| m <= UnshardedRecord }.each(&:reset_column_information)
     end
+
+    def with_empty_caches
+      connection = ::ActiveRecord::Base.connection
+      connection_pool = ::ActiveRecord::Base.connection_pool
+      previous_schema_cache = connection_pool.get_schema_cache(connection)
+      temporary_schema_cache = ::ActiveRecord::ConnectionAdapters::SchemaCache.new(connection)
+
+      reset_column_information
+      connection_pool.set_schema_cache(temporary_schema_cache)
+
+      yield
+
+      connection_pool.set_schema_cache(previous_schema_cache)
+      reset_column_information
+    end
   end
 end

data/lib/switchman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Switchman
-  VERSION = '3.3.4'
+  VERSION = '3.3.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.3.6
 platform: ruby
 authors:
 - Cody Cutrer