switchman 1.11.7 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 1226a18b3b4a82f0362cf1b706fd97c1f3ef84067781908421f7852c312e8d56
-  data.tar.gz: 28acc935d4292c51a9ef0d4a1644b110c00fa414fb2e9e20b272848c66a4a9e3
+SHA1:
+  metadata.gz: 4cbaba3af0fb2692fd3e75ec8ca0d76c2dfcc187
+  data.tar.gz: 1a6fd4d0e9b20174505d6421e819f46ab47e60aa
 SHA512:
-  metadata.gz: 29ef4b1c6ed6daf73361622702ee5a27232ba8adfbc7049be660f3e6e3074204cf116e09d5388c2dfc927b8b073ff973f17d24c0824f472eb87c83f9d3057db0
-  data.tar.gz: dadcf10f6ca9cee1c1acd5c0d15b342f8c143b3c7f1d31728aeefecc61fdc71f45ecf9b0e64b9db20618adc74277bcd6a9200bc3a6752d67ea187ba7b43b1fd3
+  metadata.gz: 2f7720c65be9c6dd30af6b8a21e6dad2b9ba6028d2ab743cd03a941cae96fb69c245b3935adc48e725e3361458052f2e28f2ac6bbc4c92a0641241c24b5a5ff5
+  data.tar.gz: a9f90607b3362d9f32530e99b17bded68cda2a5f4733c79916e0c1b0fa84a4f33ded8c43c3c9afefcb457e5a5fc4bb2a7e97e5b4e3b30e9d17ba81603050a7a5

data/app/models/switchman/shard_internal.rb

@@ -429,6 +429,8 @@ module Switchman
       def integral_id_for(any_id)
         if any_id.is_a?(::Arel::Nodes::Casted)
           any_id = any_id.val
+        elsif any_id.is_a?(::Arel::Nodes::BindParam) && ::Rails.version >= "5.2"
+          any_id = any_id.value.value_before_type_cast
         end
 
         case any_id

data/lib/switchman/active_record/association.rb

@@ -76,6 +76,15 @@ module Switchman
 
     module Preloader
       module Association
+        if ::Rails.version >= "5.2"
+          def run(preloader)
+            # TODO - can move associated_records_by_owner into this after 5.1 is gonzo
+            associated_records_by_owner(preloader).each do |owner, records|
+              associate_records_to_owner(owner, records)
+            end
+          end
+        end
+
         def associated_records_by_owner(preloader = nil)
           owners_map = owners_by_key
 

data/lib/switchman/active_record/finder_methods.rb

@@ -45,7 +45,9 @@ module Switchman
         conditions = conditions.id if ::ActiveRecord::Base === conditions
         return false if !conditions
 
-        relation = apply_join_dependency(self, construct_join_dependency)
+        relation = ::Rails.version >= "5.2" ?
+          apply_join_dependency(eager_loading: false) :
+          apply_join_dependency(self, construct_join_dependency)
         return false if ::ActiveRecord::NullRelation === relation
 
         relation = relation.except(:select, :order).select("1 AS one").limit(1)
@@ -58,7 +60,9 @@ module Switchman
         end
 
         relation.activate do |shard_rel|
-          return true if connection.select_value(shard_rel, "#{name} Exists", shard_rel.bound_attributes)
+          return true if ::Rails.version >= "5.2" ?
+            connection.select_value(shard_rel.arel, "#{name} Exists") :
+            connection.select_value(shard_rel, "#{name} Exists", shard_rel.bound_attributes)
         end
         false
       end

data/lib/switchman/active_record/log_subscriber.rb

@@ -21,7 +21,8 @@ module Switchman
           if ::Rails.version < '5.0.3'
             binds = "  " + payload[:binds].map { |attr| render_bind(attr) }.inspect
           else
-            args = ::Rails.version < '5.1.5' ?
+            use_old_format = (::Rails.version < '5.1') ? (::Rails.version < '5.0.7') : (::Rails.version < '5.1.5')
+            args = use_old_format ?
               [payload[:binds], payload[:type_casted_binds]] :
               [payload[:type_casted_binds]]
             casted_params = type_casted_binds(*args)

data/lib/switchman/active_record/postgresql_adapter.rb

@@ -135,7 +135,11 @@ module Switchman
             where = inddef.scan(/WHERE (.+)$/).flatten[0]
             using = inddef.scan(/USING (.+?) /).flatten[0].to_sym
 
-            ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(table_name, index_name, unique, column_names, [], orders, where, nil, using)
+            if ::Rails.version >= "5.2"
+              ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(table_name, index_name, unique, column_names, orders: orders, where: where, using: using)
+            else
+              ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(table_name, index_name, unique, column_names, [], orders, where, nil, using)
+            end
           end
         end.compact
       end

data/lib/switchman/active_record/query_cache.rb

@@ -78,8 +78,9 @@ module Switchman
           sql = "#{self.shard.id}::#{sql}"
           result =
               if query_cache[sql].key?(binds)
-                ::ActiveSupport::Notifications.instrument("sql.active_record",
-                                                        :sql => sql, :binds => binds, :name => "CACHE", :connection_id => object_id)
+                args = {:sql => sql, :binds => binds, :name => "CACHE", :connection_id => object_id}
+                args[:type_casted_binds] = -> { type_casted_binds(binds) } if ::Rails.version >= '5.0.7'
+                ::ActiveSupport::Notifications.instrument("sql.active_record", args)
                 query_cache[sql][binds]
               else
                 query_cache[sql][binds] = yield

data/lib/switchman/active_record/query_methods.rb

@@ -78,26 +78,45 @@ module Switchman
 
       private
 
-      [:where, :having].each do |type|
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def transpose_#{type}_clauses(source_shard, target_shard, remove_nonlocal_primary_keys)            
+      if ::Rails.version >= '5.2'
+        [:where, :having].each do |type|
+          class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def transpose_#{type}_clauses(source_shard, target_shard, remove_nonlocal_primary_keys)
             unless (predicates = #{type}_clause.send(:predicates)).empty?
-              new_predicates, new_binds = transpose_predicates(predicates, source_shard,
-                                                               target_shard, remove_nonlocal_primary_keys,
-                                                               binds: #{type}_clause.binds,
-                                                               dup_binds_on_mutation: true)
-              if new_predicates != predicates || !new_binds.equal?(#{type}_clause.binds)
+              new_predicates, _binds = transpose_predicates(predicates, source_shard,
+                                                               target_shard, remove_nonlocal_primary_keys)
+              if new_predicates != predicates
                 self.#{type}_clause = #{type}_clause.dup
                 if new_predicates != predicates
                   #{type}_clause.instance_variable_set(:@predicates, new_predicates)
                 end
-                if !new_binds.equal?(#{type}_clause.binds)
-                  #{type}_clause.instance_variable_set(:@binds, new_binds)
-                end
               end
-            end            
+            end
           end
-        RUBY
+          RUBY
+        end
+      else
+        [:where, :having].each do |type|
+          class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def transpose_#{type}_clauses(source_shard, target_shard, remove_nonlocal_primary_keys)
+              unless (predicates = #{type}_clause.send(:predicates)).empty?
+                new_predicates, new_binds = transpose_predicates(predicates, source_shard,
+                                                                 target_shard, remove_nonlocal_primary_keys,
+                                                                 binds: #{type}_clause.binds,
+                                                                 dup_binds_on_mutation: true)
+                if new_predicates != predicates || !new_binds.equal?(#{type}_clause.binds)
+                  self.#{type}_clause = #{type}_clause.dup
+                  if new_predicates != predicates
+                    #{type}_clause.instance_variable_set(:@predicates, new_predicates)
+                  end
+                  if !new_binds.equal?(#{type}_clause.binds)
+                    #{type}_clause.instance_variable_set(:@binds, new_binds)
+                  end
+                end
+              end
+            end
+          RUBY
+        end
       end
 
       def transpose_clauses(source_shard, target_shard, remove_nonlocal_primary_keys = false)
@@ -138,17 +157,23 @@ module Switchman
               return
             end
           when ::Arel::Nodes::BindParam
-            # look for a bind param with a matching column name
-            if binds && bind = binds.detect{|b| b&.name.to_s == klass.primary_key.to_s}
-              unless bind.value.is_a?(::ActiveRecord::StatementCache::Substitute)
-                local_id, id_shard = Shard.local_id_for(bind.value)
-                id_shard ||= Shard.current(klass.shard_category) if local_id
+            if ::Rails.version >= "5.2"
+              local_id, id_shard = Shard.local_id_for(primary_key.right.value.value_before_type_cast)
+              id_shard ||= Shard.current(klass.shard_category) if local_id
+            else
+              # look for a bind param with a matching column name
+              if binds && bind = binds.detect{|b| b&.name.to_s == klass.primary_key.to_s}
+                unless bind.value.is_a?(::ActiveRecord::StatementCache::Substitute)
+                  local_id, id_shard = Shard.local_id_for(bind.value)
+                  id_shard ||= Shard.current(klass.shard_category) if local_id
+                end
               end
             end
           else
             local_id, id_shard = Shard.local_id_for(primary_key.right)
             id_shard ||= Shard.current(klass.shard_category) if local_id
           end
+
           return if !id_shard || id_shard == primary_shard
           transpose_clauses(primary_shard, id_shard)
           self.shard_value = id_shard
@@ -242,50 +267,59 @@ module Switchman
                 source_shard_for_foreign_key(relation, column)
               end
 
-          new_right_value = case predicate.right
-          when Array
-            local_ids = []
-            predicate.right.each do |value|
-              local_id = Shard.relative_id_for(value, current_source_shard, target_shard)
-              next unless local_id
-              unless remove && local_id > Shard::IDS_PER_SHARD
-                if value.is_a?(::Arel::Nodes::Casted)
-                  if local_id == value.val
-                    local_id = value
-                  elsif local_id != value
-                    local_id = value.class.new(local_id, value.attribute)
+          if ::Rails.version >= "5.2"
+            new_right_value =
+              case predicate.right
+              when Array
+                predicate.right.map {|val| transpose_predicate_value(val, current_source_shard, target_shard, type, remove) }
+              else
+                transpose_predicate_value(predicate.right, current_source_shard, target_shard, type, remove)
+              end
+          else
+            new_right_value = case predicate.right
+            when Array
+              local_ids = []
+              predicate.right.each do |value|
+                local_id = Shard.relative_id_for(value, current_source_shard, target_shard)
+                next unless local_id
+                unless remove && local_id > Shard::IDS_PER_SHARD
+                  if value.is_a?(::Arel::Nodes::Casted)
+                    if local_id == value.val
+                      local_id = value
+                    elsif local_id != value
+                      local_id = value.class.new(local_id, value.attribute)
+                    end
                   end
+                  local_ids << local_id
                 end
-                local_ids << local_id
               end
-            end
-            local_ids
-          when ::Arel::Nodes::BindParam
-            # look for a bind param with a matching column name
-            if binds && bind = binds.detect{|b| b&.name.to_s == predicate.left.name.to_s}
-              # before we mutate, dup
-              if dup_binds_on_mutation
-                binds = binds.map(&:dup)
-                dup_binds_on_mutation = false
-                bind = binds.find { |b| b&.name.to_s == predicate.left.name.to_s }
-              end
-              if bind.value.is_a?(::ActiveRecord::StatementCache::Substitute)
-                bind.value.sharded = true # mark for transposition later
-                bind.value.primary = true if type == :primary
-              else
-                local_id = Shard.relative_id_for(bind.value, current_source_shard, target_shard)
-                local_id = [] if remove && local_id > Shard::IDS_PER_SHARD
-                bind.instance_variable_set(:@value, local_id)
-                bind.instance_variable_set(:@value_for_database, nil)
+              local_ids
+            when ::Arel::Nodes::BindParam
+              # look for a bind param with a matching column name
+              if binds && bind = binds.detect{|b| b&.name.to_s == predicate.left.name.to_s}
+                # before we mutate, dup
+                if dup_binds_on_mutation
+                  binds = binds.map(&:dup)
+                  dup_binds_on_mutation = false
+                  bind = binds.find { |b| b&.name.to_s == predicate.left.name.to_s }
+                end
+                if bind.value.is_a?(::ActiveRecord::StatementCache::Substitute)
+                  bind.value.sharded = true # mark for transposition later
+                  bind.value.primary = true if type == :primary
+                else
+                  local_id = Shard.relative_id_for(bind.value, current_source_shard, target_shard)
+                  local_id = [] if remove && local_id > Shard::IDS_PER_SHARD
+                  bind.instance_variable_set(:@value, local_id)
+                  bind.instance_variable_set(:@value_for_database, nil)
+                end
               end
+              predicate.right
+            else
+              local_id = Shard.relative_id_for(predicate.right, current_source_shard, target_shard) || predicate.right
+              local_id = [] if remove && local_id.is_a?(Fixnum) && local_id > Shard::IDS_PER_SHARD
+              local_id
             end
-            predicate.right
-          else
-            local_id = Shard.relative_id_for(predicate.right, current_source_shard, target_shard) || predicate.right
-            local_id = [] if remove && local_id.is_a?(Fixnum) && local_id > Shard::IDS_PER_SHARD
-            local_id
           end
-
           if new_right_value == predicate.right
             predicate
           elsif predicate.right.is_a?(::Arel::Nodes::Casted)
@@ -301,6 +335,31 @@ module Switchman
         result = [result, binds]
         result
       end
+
+      def transpose_predicate_value(value, current_shard, target_shard, attribute_type, remove_non_local_ids)
+        if value.is_a?(::Arel::Nodes::BindParam)
+          query_att = value.value
+          current_id = query_att.value_before_type_cast
+          if current_id.is_a?(::ActiveRecord::StatementCache::Substitute)
+            current_id.sharded = true # mark for transposition later
+            current_id.primary = true if attribute_type == :primary
+            value
+          else
+            local_id = Shard.relative_id_for(current_id, current_shard, target_shard) || current_id
+            local_id = [] if remove_non_local_ids && local_id.is_a?(Fixnum) && local_id > Shard::IDS_PER_SHARD
+            if current_id != local_id
+              # make a new bind param
+              ::Arel::Nodes::BindParam.new(query_att.class.new(query_att.name, local_id, query_att.type))
+            else
+              value
+            end
+          end
+        else
+          local_id = Shard.relative_id_for(value, current_shard, target_shard) || value
+          local_id = [] if remove_non_local_ids && local_id.is_a?(Fixnum) && local_id > Shard::IDS_PER_SHARD
+          local_id
+        end
+      end
     end
   end
 end

data/lib/switchman/active_record/reflection.rb

@@ -26,21 +26,21 @@ module Switchman
         # this technically belongs on AssociationReflection, but we put it on
         # ThroughReflection as well, instead of delegating to its internal
         # HasManyAssociation, losing its proper `klass`
-        def association_scope_cache(conn, owner)
+        def association_scope_cache(conn, owner, &block)
           key = conn.prepared_statements
           if polymorphic?
             key = [key, owner._read_attribute(@foreign_type)]
           end
           key = [key, shard(owner).id].flatten
           @association_scope_cache[key] ||= @scope_lock.synchronize {
-            @association_scope_cache[key] ||= yield
+            @association_scope_cache[key] ||= (::Rails.version >= "5.2" ? ::ActiveRecord::StatementCache.create(conn, &block) : block.call)
           }
         end
       end
 
       module AssociationReflection
         def join_id_for(owner)
-          owner.send(active_record_primary_key) # use sharded id values in association binds
+          owner.send(::Rails.version >= "5.2" ? join_foreign_key : active_record_primary_key) # use sharded id values in association binds
         end
       end
     end

data/lib/switchman/active_record/statement_cache.rb

@@ -5,14 +5,21 @@ module Switchman
         def create(connection, block = Proc.new)
           relation = block.call ::ActiveRecord::StatementCache::Params.new
 
-          bind_map = ::ActiveRecord::StatementCache::BindMap.new(relation.bound_attributes )
-          new relation.arel, bind_map
+          if ::Rails.version >= "5.2"
+            query_builder, binds = connection.cacheable_query(self, relation.arel)
+            bind_map = ::ActiveRecord::StatementCache::BindMap.new(binds)
+            new(relation.arel, bind_map, relation.klass)
+          else
+            bind_map = ::ActiveRecord::StatementCache::BindMap.new(relation.bound_attributes)
+            new relation.arel, bind_map
+          end
         end
       end
 
-      def initialize(arel, bind_map)
+      def initialize(arel, bind_map, klass=nil)
         @arel = arel
         @bind_map = bind_map
+        @klass = klass
         @qualified_query_builders = {}
       end
 
@@ -21,7 +28,13 @@ module Switchman
       # we can make some assumptions about the shard source
       # (e.g. infer from the primary key or use the current shard)
 
-      def execute(params, klass, connection)
+      def execute(*args)
+        if ::Rails.version >= '5.2'
+          params, connection = args
+          klass = @klass
+        else
+          params, klass, connection = args
+        end
         target_shard = nil
         if primary_index = bind_map.primary_value_index
           primary_value = params[primary_index]
@@ -51,7 +64,7 @@ module Switchman
         def qualified_query_builder(shard, klass)
           @qualified_query_builders[shard.id] ||= klass.connection.cacheable_query(@arel)
         end
-      else
+      elsif ::Rails.version < '5.2'
         def generic_query_builder(connection)
           @query_builder ||= connection.cacheable_query(self.class, @arel)
         end
@@ -59,6 +72,14 @@ module Switchman
         def qualified_query_builder(shard, klass)
           @qualified_query_builders[shard.id] ||= klass.connection.cacheable_query(self.class, @arel)
         end
+      else
+        def generic_query_builder(connection)
+          @query_builder ||= connection.cacheable_query(self.class, @arel).first
+        end
+
+        def qualified_query_builder(shard, klass)
+          @qualified_query_builders[shard.id] ||= klass.connection.cacheable_query(self.class, @arel).first
+        end
       end
 
       module BindMap

data/lib/switchman/active_record/where_clause_factory.rb

@@ -19,9 +19,10 @@ module Switchman
           super
         when Hash, ::Arel::Nodes::Node
           where_clause = super
+          binds = ::Rails.version >= "5.2" ? nil : where_clause.binds
           predicates = where_clause.send(:predicates)
-          @scope.send(:infer_shards_from_primary_key, predicates, where_clause.binds) if @scope.shard_source_value == :implicit && @scope.shard_value.is_a?(Shard)
-          predicates, _new_binds = @scope.transpose_predicates(predicates, nil, @scope.primary_shard, false, binds: where_clause.binds)
+          @scope.send(:infer_shards_from_primary_key, predicates, binds) if @scope.shard_source_value == :implicit && @scope.shard_value.is_a?(Shard)
+          predicates, _new_binds = @scope.transpose_predicates(predicates, nil, @scope.primary_shard, false, binds: binds)
           where_clause.instance_variable_set(:@predicates, predicates)
           where_clause
         else

data/lib/switchman/connection_pool_proxy.rb

@@ -71,7 +71,9 @@ module Switchman
       end
     end
 
-    %w{release_connection disconnect!
+    %w{release_connection
+       disconnect!
+       flush!
        clear_reloadable_connections!
        verify_active_connections!
        clear_stale_cached_connections!
@@ -84,6 +86,10 @@ module Switchman
       RUBY
     end
 
+    def discard!
+      # this breaks everything if i try to pass it onto the pools and i'm not sure why
+    end
+
     def automatic_reconnect=(value)
       connection_pools.each { |pool| pool.automatic_reconnect = value }
     end

data/lib/switchman/database_server.rb

@@ -214,7 +214,10 @@ module Switchman
 
                 unless create_schema == false
                   reset_column_information
-                  migrate = -> { ::ActiveRecord::Migrator.migrate(::ActiveRecord::Migrator.migrations_paths) }
+
+                  migrate = ::Rails.version >= '5.2' ?
+                    -> { ::ActiveRecord::Base.connection.migration_context.migrate } :
+                    -> { ::ActiveRecord::Migrator.migrate(::ActiveRecord::Migrator.migrations_paths) }
                   if ::ActiveRecord::Base.connection.supports_ddl_transactions?
                     ::ActiveRecord::Base.connection.transaction(requires_new: true, &migrate)
                   else

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.11.7"
+  VERSION = "1.12.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.11.7
+  version: 1.12.0
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -21,7 +21,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -41,7 +41,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: shackles
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.5.2
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +191,7 @@ files:
 - db/migrate/20130328212039_create_switchman_shards.rb
 - db/migrate/20130328224244_create_default_shard.rb
 - db/migrate/20161206323434_add_back_default_string_limits_switchman.rb
+- db/shard_1708.sqlite3
 - lib/switchman.rb
 - lib/switchman/action_controller/caching.rb
 - lib/switchman/active_record/abstract_adapter.rb
@@ -243,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Rails 4 sharding magic