switchman 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb1dad0f6da4624a6946a25d2afb9a398fa101df
-  data.tar.gz: 27c1f2e00c09a1b585408144526de94ce438561b
+  metadata.gz: 8a8e56791eabefc33f16db7b5f9917c547758b19
+  data.tar.gz: 9c5746a17f3b2c08f0a3a5e3d30823966e15017e
 SHA512:
-  metadata.gz: fdf18b474711a37ade96a52015f09d736725a030151e97b0ac341741c254f1816409f36d564d19a5d4fbd29cea585d69f7c7f64c7029bd7a99cf026515fd8a07
-  data.tar.gz: 80708161aeedbb40f42ca1f837ab9333f14a7a94d1d1ca3608c28bd1cbc655cbdc5471960a437f5c82a6a3813ce23008f7034b2374c2cafc16852822b2e20cec
+  metadata.gz: f90666ec8cdaea74595ebcdb75c84ae69aae97c4e48997fc7c1779ad3340e3fb0350b24b87e888b0365a27098e64fe0e28ea6895932e62b3f275d18a43abab99
+  data.tar.gz: 6d4f656621629771412e95f1facca1ce1b30023f20247b70cf383a995e636763408dd62db9312ac2356b2c633ddca72502079bef05158c3926133411d01405ec

data/app/models/switchman/shard_internal.rb

@@ -11,12 +11,12 @@ module Switchman
     CATEGORIES =
       {
           # special cased to mean all other models
-          :default => nil,
+          :primary => nil,
           # special cased to not allow activating a shard other than the default
           :unsharded => [Shard]
       }
     private_constant :CATEGORIES
-    @shard_category = :unsharded
+    @connection_specification_name = @shard_category = :unsharded
 
     if defined?(::ProtectedAttributes)
       attr_accessible :default, :name, :database_server
@@ -71,7 +71,7 @@ module Switchman
         @default
       end
 
-      def current(category = :default)
+      def current(category = :primary)
         active_shards[category] || Shard.default
       end
 
@@ -682,7 +682,7 @@ module Switchman
 
     def hashify_categories(categories)
       if categories.empty?
-        { :default => self }
+        { :primary => self }
       else
         categories.inject({}) { |h, category| h[category] = self; h }
       end

data/lib/switchman/active_record/attribute_methods.rb

@@ -65,8 +65,8 @@ module Switchman
           if reflection
             if reflection.options[:polymorphic]
               # a polymorphic association has to be discovered at runtime. This code ends up being something like
-              # context_type.try(:constantize).try(:shard_category) || :default
-              "read_attribute(:#{reflection.foreign_type}).try(:constantize).try(:shard_category) || :default"
+              # context_type.try(:constantize).try(:shard_category) || :primary
+              "read_attribute(:#{reflection.foreign_type}).try(:constantize).try(:shard_category) || :primary"
             else
               # otherwise we can just return a symbol for the statically known type of the association
               reflection.klass.shard_category.inspect

data/lib/switchman/active_record/base.rb

@@ -4,8 +4,14 @@ module Switchman
       module ClassMethods
         delegate :shard, to: :all
 
-        def shard_category
-          @shard_category || (self.superclass < ::ActiveRecord::Base && self.superclass.shard_category) || :default
+        if ::Rails.version < '5'
+          def shard_category
+            @shard_category || (self.superclass < ::ActiveRecord::Base && self.superclass.shard_category) || :primary
+          end
+        else
+          def shard_category
+            connection_specification_name.to_sym
+          end
         end
 
         def shard_category=(category)
@@ -14,11 +20,15 @@ module Switchman
             categories[shard_category].delete(self)
             categories.delete(shard_category) if categories[shard_category].empty?
           end
-          connection_handler.uninitialize_ar(self)
           categories[category] ||= []
           categories[category] << self
-          @shard_category = category
-          connection_handler.initialize_categories(superclass)
+          if ::Rails.version < '5'
+            connection_handler.uninitialize_ar(self)
+            @shard_category = category
+            connection_handler.initialize_categories(superclass)
+          else
+            self.connection_specification_name = category.to_s
+          end
         end
 
         def integral_id?

data/lib/switchman/active_record/calculations.rb

@@ -76,7 +76,7 @@ module Switchman
         opts = grouped_calculation_options(operation.to_s.downcase, column_name, distinct)
 
         relation = build_grouped_calculation_relation(opts)
-        target_shard = Shard.current(:default)
+        target_shard = Shard.current(:primary)
 
         rows = relation.activate do |rel, shard|
           calculated_data = klass.connection.select_all(rel)

data/lib/switchman/active_record/connection_handler.rb

@@ -22,8 +22,9 @@ module Switchman
         end
       end
 
-      def establish_connection(owner, spec)
-        super
+      def establish_connection(*args)
+        pool = super
+        owner, spec = ::Rails.version < '5' ? args : [nil, args.first]
 
         # this is the first place that the adapter would have been required; but now we
         # need this addition ASAP since it will be called when loading the default shard below
@@ -32,17 +33,6 @@ module Switchman
           ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(ActiveRecord::PostgreSQLAdapter)
         end
 
-        # AR3 uses the name, AR4 uses the model
-        model = case owner
-                when String
-                  owner.constantize
-                when Class
-                  owner
-                else
-                  raise "unknown owner #{owner}"
-                end
-        pool = owner_to_pool[owner.name]
-
         first_time = !Shard.instance_variable_get(:@default)
         if first_time
           # Have to cache the default shard before we insert sharding, otherwise the first access
@@ -55,13 +45,19 @@ module Switchman
 
           ::ActiveRecord::Base.configurations[::Rails.env] = spec.instance_variable_get(:@config).stringify_keys
         end
+
         @shard_connection_pools ||= { [:master, Shard.default.database_server.shareable? ? ::Rails.env : Shard.default] => pool}
 
-        proxy = ConnectionPoolProxy.new(model.shard_category,
+        category = ::Rails.version < '5' ? owner.shard_category : pool.spec.name.to_sym
+        proxy = ConnectionPoolProxy.new(category,
                                         pool,
                                         @shard_connection_pools)
-        owner_to_pool[owner.name] = proxy
-        class_to_pool.clear
+        if ::Rails.version < '5'
+          owner_to_pool[owner.name] = proxy
+          class_to_pool.clear
+        else
+          owner_to_pool[pool.spec.name] = proxy
+        end
 
         if first_time
           if Shard.default.database_server.config[:prefer_slave]
@@ -79,7 +75,7 @@ module Switchman
         # DON'T do it if we're not the current connection handler - that means
         # we're in the middle of switching environments, and we don't want to
         # establish a connection with incorrect settings
-        if (model == ::ActiveRecord::Base || model == Shard) && self == ::ActiveRecord::Base.connection_handler && !first_time
+        if [:primary, :unsharded].include?(category) && self == ::ActiveRecord::Base.connection_handler && !first_time
           Shard.default(reload: true, with_fallback: true)
           proxy.disconnect!
         end
@@ -106,50 +102,85 @@ module Switchman
         proxy
       end
 
-      def remove_connection(model)
-        uninitialize_ar(model) if owner_to_pool[model.name].is_a?(ConnectionPoolProxy)
-        result = super
-        initialize_categories
-        result
-      end
-
-      def pool_for(owner)
-        # copypasted from AR#ConnectionHandler other than proxy handling
+      if ::Rails.version < '5'
+        def remove_connection(model)
+          uninitialize_ar(model) if owner_to_pool[model.name].is_a?(ConnectionPoolProxy)
+          result = super
+          initialize_categories
+          result
+        end
 
-        owner_to_pool.fetch(owner.name) {
-          if ancestor_pool = pool_from_any_process_for(owner)
-            # A connection was established in an ancestor process that must have
-            # subsequently forked. We can't reuse the connection, but we can copy
-            # the specification and establish a new connection with it.
-            if ancestor_pool.is_a?(ConnectionPoolProxy)
-              establish_connection owner, ancestor_pool.default_pool.spec
+        def pool_for(owner)
+          # copypasted from AR#ConnectionHandler other than proxy handling
+
+          owner_to_pool.fetch(owner.name) {
+            if ancestor_pool = pool_from_any_process_for(owner)
+              # A connection was established in an ancestor process that must have
+              # subsequently forked. We can't reuse the connection, but we can copy
+              # the specification and establish a new connection with it.
+              if ancestor_pool.is_a?(ConnectionPoolProxy)
+                establish_connection owner, ancestor_pool.default_pool.spec
+              else
+                establish_connection owner, ancestor_pool.spec
+              end
             else
-              establish_connection owner, ancestor_pool.spec
+              owner_to_pool[owner.name] = nil
             end
-          else
-            owner_to_pool[owner.name] = nil
-          end
-        }
-      end
+          }
+        end
 
-      def retrieve_connection_pool(klass)
-        class_to_pool[klass.name] ||= begin
-          original_klass = klass
-          until pool = pool_for(klass)
-            klass = klass.superclass
-            break unless klass <= Base
-          end
+        def retrieve_connection_pool(klass)
+          class_to_pool[klass.name] ||= begin
+            original_klass = klass
+            until pool = pool_for(klass)
+              klass = klass.superclass
+              break unless klass <= Base
+            end
+
+            if pool.is_a?(ConnectionPoolProxy) && pool.category != original_klass.shard_category
+              default_pool = pool.default_pool
+              pool = nil
+              class_to_pool.each_value { |p| pool = p if p.is_a?(ConnectionPoolProxy) &&
+                  p.category == original_klass.shard_category &&
+                  p.default_pool == default_pool }
+              pool ||= ConnectionPoolProxy.new(original_klass.shard_category, default_pool, @shard_connection_pools)
+            end
 
-          if pool.is_a?(ConnectionPoolProxy) && pool.category != original_klass.shard_category
-            default_pool = pool.default_pool
-            pool = nil
-            class_to_pool.each_value { |p| pool = p if p.is_a?(ConnectionPoolProxy) &&
-                p.category == original_klass.shard_category &&
-                p.default_pool == default_pool }
-            pool ||= ConnectionPoolProxy.new(original_klass.shard_category, default_pool, @shard_connection_pools)
+            class_to_pool[original_klass.name] = pool
           end
+        end
+      else
+        def remove_connection(spec_name)
+          pool = owner_to_pool[spec_name]
+          owner_to_pool[spec_name] = pool.default_pool if pool.is_a?(ConnectionPoolProxy)
+          super
+        end
 
-          class_to_pool[original_klass.name] = pool
+        def retrieve_connection_pool(spec_name)
+          owner_to_pool.fetch(spec_name) do
+            if ancestor_pool = pool_from_any_process_for(spec_name)
+              # A connection was established in an ancestor process that must have
+              # subsequently forked. We can't reuse the connection, but we can copy
+              # the specification and establish a new connection with it.
+              pool = nil
+              if ancestor_pool.is_a?(ConnectionPoolProxy)
+                pool = establish_connection ancestor_pool.default_pool.spec
+              else
+                pool = establish_connection ancestor_pool.spec
+              end
+              pool.instance_variable_set(:@schema_cache, ancestor_pool.schema_cache) if ancestor_pool.schema_cache
+              pool
+            elsif spec_name != "primary"
+              primary_pool = retrieve_connection_pool("primary")
+              if primary_pool.is_a?(ConnectionPoolProxy)
+                ConnectionPoolProxy.new(spec_name.to_sym, primary_pool.default_pool, @shard_connection_pools)
+              else
+                primary_pool
+              end
+            else
+              owner_to_pool[spec_name] = nil
+            end
+          end
         end
       end
 
@@ -159,7 +190,7 @@ module Switchman
       end
 
       def switchman_connection_pool_proxies
-        class_to_pool.values.uniq
+        (::Rails.version < '5' ? class_to_pool : owner_to_pool).values.uniq.select{|p| p.is_a?(ConnectionPoolProxy)}
       end
 
       private

data/lib/switchman/active_record/relation.rb

@@ -7,13 +7,13 @@ module Switchman
 
       def initialize(*args)
         super
-        self.shard_value = Shard.current(klass ? klass.shard_category : :default) unless shard_value
+        self.shard_value = Shard.current(klass ? klass.shard_category : :primary) unless shard_value
         self.shard_source_value = :implicit unless shard_source_value
       end
 
       def clone
         result = super
-        result.shard_value = Shard.current(klass ? klass.shard_category : :default) unless shard_value
+        result.shard_value = Shard.current(klass ? klass.shard_category : :primary) unless shard_value
         result
       end
 
@@ -47,7 +47,7 @@ module Switchman
         self.activate { |relation| relation.explain(super_method: true) }
       end
 
-      to_a_method = ::Rails.version > '5.0.0.beta2' ? :records : :to_a
+      to_a_method = ::Rails.version >= '5' ? :records : :to_a
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{to_a_method}(super_method: false)
           return super() if super_method

data/lib/switchman/connection_pool_proxy.rb

@@ -79,6 +79,10 @@ module Switchman
       EOS
     end
 
+    def automatic_reconnect=(value)
+      @connection_pools.values.each { |pool| pool.automatic_reconnect = value }
+    end
+
     def clear_idle_connections!(since_when)
       @connection_pools.values.each { |pool| pool.clear_idle_connections!(since_when) }
     end
@@ -113,7 +117,9 @@ module Switchman
           end
         end
       end
-      spec = ::ActiveRecord::ConnectionAdapters::ConnectionSpecification.new(config, "#{config[:adapter]}_connection")
+      args = [config, "#{config[:adapter]}_connection"]
+      args.unshift(pool_key.join("/")) if ::Rails.version >= '5' # seems as good a name as any
+      spec = ::ActiveRecord::ConnectionAdapters::ConnectionSpecification.new(*args)
       # unfortunately the AR code that does this require logic can't really be
       # called in isolation
       require "active_record/connection_adapters/#{config[:adapter]}_adapter"

data/lib/switchman/shackles.rb

@@ -11,7 +11,7 @@ module Switchman
         environment ||= :master
         activated_environments << environment
         old_environment = self.environment
-        @environment = environment
+        Thread.current[:shackles_environment] = environment
         old_environment
       end
 

data/lib/switchman/standard_error.rb

@@ -5,7 +5,7 @@ module Switchman
       super
     end
 
-    def current_shard(category = :default)
+    def current_shard(category = :primary)
       @active_shards[category] || Shard.default
     end
   end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.6.1"
+  VERSION = "1.7.0"
 end

data/lib/tasks/switchman.rake

@@ -48,7 +48,7 @@ module Switchman
     # task. tasks which modify the schema may want to pass all categories in
     # so that schema updates for non-default tables happen against all shards.
     # this is handled automatically for the default migration tasks, below.
-    def self.shardify_task(task_name, categories: [:default])
+    def self.shardify_task(task_name, categories: [:primary])
       old_task = ::Rake::Task[task_name]
       old_actions = old_task.actions.dup
       old_task.actions.clear

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -21,7 +21,7 @@ dependencies:
         version: '4.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '4.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -41,7 +41,7 @@ dependencies:
         version: '4.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,21 +51,21 @@ dependencies:
         version: '4.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: shackles
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.3'
 description: Sharding
 email:
 - cody@instructure.com