switchman 1.9.3 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd6a78ff6974c70fd495154833ff83a7b1408d89
-  data.tar.gz: a6ba5ec6032e7b82d808115cc09ce37d10a89b09
+  metadata.gz: 7953977b213e8fd57db12680f2e250db59e6cee0
+  data.tar.gz: 86a55be8ebd4c40c7071d0ef65886fd83102a4ce
 SHA512:
-  metadata.gz: 9a3a696130257d94b959fd6ef57e200196fe9993aa066a356b6ebde4ef56076ac342bbd8bc866eb45e1e0c9cd3229201972b039a02f209b258ecc2788fabfa6a
-  data.tar.gz: ce87fe2d582572246d05c7761b61fd3b4b1ce7dc49d90e0cf9037de78edfd73e67ba7641c87e6737320aca0b2ac30e8191d570f45ca82454ff045fc77dfc6158
+  metadata.gz: b1ccbcf0e7281cd022bf912a7cfc4dc43dc6801c3556e942929ca4bccd9c308feaed966dc84b3321238f263356bee6b23bfa9e177450555d9786405b48e2b04a
+  data.tar.gz: 73491652b599c6c693ffd60563aae72a63f84fef8d96c36aa7e3028edc7f0dc2099d30e328d6badc0088988b8a2b210319b8072e6874763cdb824f018e436d85

data/lib/switchman/active_record/base.rb

@@ -104,22 +104,18 @@ module Switchman
         end
       end
 
-      def scope_class
-        self.class.base_class
-      end
-
       def save(*args)
         @shard_set_in_stone = true
-        scope_class.shard(shard, :implicit).scoping { super }
+        self.class.shard(shard, :implicit).scoping { super }
       end
 
       def save!(*args)
         @shard_set_in_stone = true
-        scope_class.shard(shard, :implicit).scoping { super }
+        self.class.shard(shard, :implicit).scoping { super }
       end
 
       def destroy
-        scope_class.shard(shard, :implicit).scoping { super }
+        self.class.shard(shard, :implicit).scoping { super }
       end
 
       def clone
@@ -151,6 +147,14 @@ module Switchman
         @shard_set_in_stone = false
         copy
       end
+
+      if ::Rails.version >= '5'
+        def quoted_id
+          return super unless self.class.sharded_primary_key?
+          # do this the Rails 4.2 way, so that if Shard.current != self.shard, the id gets transposed
+          self.class.connection.quote(id, column_for_attribute(self.class.primary_key))
+        end
+      end
     end
   end
 end

data/lib/switchman/active_record/query_cache.rb

@@ -1,79 +1,81 @@
 module Switchman
   module ActiveRecord
     module QueryCache
-      # thread local accessors to replace @query_cache_enabled
-      def query_cache
-        thread_cache = Thread.current[:query_cache] ||= {}
-        thread_cache[self.object_id] ||= Hash.new { |h,sql| h[sql] = {} }
-      end
+      if ::Rails.version < '5.0.1'
+        # thread local accessors to replace @query_cache_enabled
+        def query_cache
+          thread_cache = Thread.current[:query_cache] ||= {}
+          thread_cache[self.object_id] ||= Hash.new { |h,sql| h[sql] = {} }
+        end
 
-      def query_cache_enabled
-        Thread.current[:query_cache_enabled]
-      end
+        def query_cache_enabled
+          Thread.current[:query_cache_enabled]
+        end
 
-      def query_cache_enabled=(value)
-        Thread.current[:query_cache_enabled] = value
-      end
+        def query_cache_enabled=(value)
+          Thread.current[:query_cache_enabled] = value
+        end
 
-      # basically wholesale repeat of the methods from the original (see
-      # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb),
-      # but with self.query_cache_enabled and self.query_cache_enabled= instead
-      # of @query_cache_enabled.
+        # basically wholesale repeat of the methods from the original (see
+        # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb),
+        # but with self.query_cache_enabled and self.query_cache_enabled= instead
+        # of @query_cache_enabled.
 
-      def enable_query_cache!
-        self.query_cache_enabled = true
-      end
+        def enable_query_cache!
+          self.query_cache_enabled = true
+        end
 
-      def disable_query_cache!
-        self.query_cache_enabled = false
-      end
+        def disable_query_cache!
+          self.query_cache_enabled = false
+        end
 
-      def cache
-        old, self.query_cache_enabled = query_cache_enabled, true
-        yield
-      ensure
-        self.query_cache_enabled = old
-        clear_query_cache unless self.query_cache_enabled
-      end
+        def cache
+          old, self.query_cache_enabled = query_cache_enabled, true
+          yield
+        ensure
+          self.query_cache_enabled = old
+          clear_query_cache unless self.query_cache_enabled
+        end
 
-      def uncached
-        old, self.query_cache_enabled = query_cache_enabled, false
-        yield
-      ensure
-        self.query_cache_enabled = old
-      end
+        def uncached
+          old, self.query_cache_enabled = query_cache_enabled, false
+          yield
+        ensure
+          self.query_cache_enabled = old
+        end
 
-      def clear_query_cache
-        Thread.current[:query_cache]&.clear
-      end
+        def clear_query_cache
+          Thread.current[:query_cache]&.clear
+        end
 
-      def select_all(arel, name = nil, binds = [], preparable: nil)
-        if self.query_cache_enabled && !locked?(arel)
-          arel, binds = binds_from_relation(arel, binds)
-          sql = to_sql(arel, binds)
-          if ::Rails.version >= '5'
-            cache_sql(sql, binds) { super(sql, name, binds, preparable: preparable) }
-          else
-            cache_sql(sql, binds) { super(sql, name, binds) }
-          end
-        else
-          if ::Rails.version >= '5'
-            super
+        def select_all(arel, name = nil, binds = [], preparable: nil)
+          if self.query_cache_enabled && !locked?(arel)
+            arel, binds = binds_from_relation(arel, binds)
+            sql = to_sql(arel, binds)
+            if ::Rails.version >= '5'
+              cache_sql(sql, binds) { super(sql, name, binds, preparable: preparable) }
+            else
+              cache_sql(sql, binds) { super(sql, name, binds) }
+            end
           else
-            super(arel, name, binds)
+            if ::Rails.version >= '5'
+              super
+            else
+              super(arel, name, binds)
+            end
           end
         end
-      end
 
-      # no reason to define these on the including class directly. the super
-      # works just as well from a method on the included module
-      [:insert, :update, :delete].each do |method_name|
-        class_eval <<-end_code, __FILE__, __LINE__ + 1
-          def #{method_name}(*args)
-            clear_query_cache if self.query_cache_enabled
-            super
-          end
-        end_code
+        # no reason to define these on the including class directly. the super
+        # works just as well from a method on the included module
+        [:insert, :update, :delete].each do |method_name|
+          class_eval <<-end_code, __FILE__, __LINE__ + 1
+            def #{method_name}(*args)
+              clear_query_cache if self.query_cache_enabled
+              super
+            end
+          end_code
+        end
       end
 
       private

data/lib/switchman/connection_pool_proxy.rb

@@ -10,7 +10,7 @@ module Switchman
   end
 
   class ConnectionPoolProxy
-    delegate :spec, :connected?, :default_schema, :with_connection,
+    delegate :spec, :connected?, :default_schema, :with_connection, :query_cache_enabled, :active_connection?,
              :to => :current_pool
 
     attr_reader :category, :schema_cache
@@ -71,7 +71,12 @@ module Switchman
       end
     end
 
-    %w{release_connection disconnect! clear_reloadable_connections! verify_active_connections! clear_stale_cached_connections!}.each do |method|
+    %w{release_connection disconnect!
+       clear_reloadable_connections!
+       verify_active_connections!
+       clear_stale_cached_connections!
+       enable_query_cache!
+       disable_query_cache! }.each do |method|
       class_eval(<<-EOS)
           def #{method}
             @connection_pools.values.each(&:#{method})
@@ -126,6 +131,9 @@ module Switchman
 
       ::ActiveRecord::ConnectionAdapters::ConnectionPool.new(spec).tap do |pool|
         pool.shard = shard
+        if ::Rails.version >= '5.0.1'
+          pool.enable_query_cache! if !@connection_pools.empty? && @connection_pools.first.last.query_cache_enabled
+        end
       end
     end
   end

data/lib/switchman/engine.rb

@@ -124,7 +124,7 @@ module Switchman
         # we want it to find the definition from
         # ActiveRecord::ConnectionAdapters::DatabaseStatements, not
         # ActiveRecord::ConnectionAdapters::QueryCache
-        ::ActiveRecord::ConnectionAdapters::QueryCache.send(:remove_method, :select_all)
+        ::ActiveRecord::ConnectionAdapters::QueryCache.send(:remove_method, :select_all) if ::Rails.version < '5.0.1'
 
         ::ActiveRecord::LogSubscriber.prepend(ActiveRecord::LogSubscriber)
         ::ActiveRecord::Reflection::AbstractReflection.include(ActiveRecord::Reflection::AbstractReflection)

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.9.3"
+  VERSION = "1.9.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.9.4
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties